From 7de7fb6b3422e6d1dac00666a992834085e745dc Mon Sep 17 00:00:00 2001 From: Cesar Eduardo Barros Date: Tue, 22 Mar 2011 16:33:22 -0700 Subject: sys_swapon: move setting of error nearer use Move the setting of the error variable nearer the goto in a few places. Avoids calling PTR_ERR() if not IS_ERR() in two places, and makes the error condition more explicit in two other places. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Jesper Juhl Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/swapfile.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mm') diff --git a/mm/swapfile.c b/mm/swapfile.c index b261e55..e4dc949 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1916,14 +1916,14 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) return PTR_ERR(p); name = getname(specialfile); - error = PTR_ERR(name); if (IS_ERR(name)) { + error = PTR_ERR(name); name = NULL; goto bad_swap_2; } swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0); - error = PTR_ERR(swap_file); if (IS_ERR(swap_file)) { + error = PTR_ERR(swap_file); swap_file = NULL; goto bad_swap_2; } @@ -1932,17 +1932,17 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) mapping = swap_file->f_mapping; inode = mapping->host; - error = -EBUSY; for (i = 0; i < nr_swapfiles; i++) { struct swap_info_struct *q = swap_info[i]; if (q == p || !q->swap_file) continue; - if (mapping == q->swap_file->f_mapping) + if (mapping == q->swap_file->f_mapping) { + error = -EBUSY; goto bad_swap; + } } - error = -EINVAL; if (S_ISBLK(inode->i_mode)) { bdev = bdgrab(I_BDEV(inode)); error = blkdev_get(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL, @@ -1966,6 +1966,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) goto bad_swap; } } else { + error = -EINVAL; goto bad_swap; } -- cgit v1.1