From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail144.messagelabs.com (mail144.messagelabs.com [216.82.254.51]) by kanga.kvack.org (Postfix) with ESMTP id E42F98D004A for ; Tue, 1 Mar 2011 18:29:02 -0500 (EST) From: Cesar Eduardo Barros Subject: [PATCHv2 09/24] sys_swapon: remove did_down variable Date: Tue, 1 Mar 2011 20:28:33 -0300 Message-Id: <1299022128-6239-10-git-send-email-cesarb@cesarb.net> In-Reply-To: <1299022128-6239-1-git-send-email-cesarb@cesarb.net> References: <4D6D7FEA.80800@cesarb.net> <1299022128-6239-1-git-send-email-cesarb@cesarb.net> Sender: owner-linux-mm@kvack.org List-ID: To: Eric B Munson Cc: linux-mm@kvack.org, Cesar Eduardo Barros Since mutex_lock(&inode->i_mutex) is called just after setting inode, did_down is always equivalent to (inode && S_ISREG(inode->i_mode)). Use this fact to remove the did_down variable. Signed-off-by: Cesar Eduardo Barros --- mm/swapfile.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 55a50ef..c655389 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1907,7 +1907,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) unsigned char *swap_map = NULL; struct page *page = NULL; struct inode *inode = NULL; - int did_down = 0; if (!capable(CAP_SYS_ADMIN)) return -EPERM; @@ -1962,7 +1961,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) } else if (S_ISREG(inode->i_mode)) { p->bdev = inode->i_sb->s_bdev; mutex_lock(&inode->i_mutex); - did_down = 1; if (IS_SWAPFILE(inode)) { error = -EBUSY; goto bad_swap; @@ -2163,7 +2161,7 @@ out: } if (name) putname(name); - if (did_down) { + if (inode && S_ISREG(inode->i_mode)) { if (!error) inode->i_flags |= S_SWAPFILE; mutex_unlock(&inode->i_mutex); -- 1.7.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org