From 83ef99befc324803a54cf2a5fab5a322df3a99d6 Mon Sep 17 00:00:00 2001 From: Cesar Eduardo Barros Date: Tue, 22 Mar 2011 16:33:21 -0700 Subject: sys_swapon: remove did_down variable 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 Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/swapfile.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'mm/swapfile.c') diff --git a/mm/swapfile.c b/mm/swapfile.c index 6f25ece88c4a..b261e55e0b82 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; @@ -2154,10 +2152,8 @@ bad_swap_2: spin_unlock(&swap_lock); vfree(swap_map); if (swap_file) { - if (did_down) { + if (inode && S_ISREG(inode->i_mode)) mutex_unlock(&inode->i_mutex); - did_down = 0; - } filp_close(swap_file, NULL); } out: @@ -2167,7 +2163,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); -- cgit v1.2.3