summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2011-03-22 16:33:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 17:44:07 -0700
commit7de7fb6b3422e6d1dac00666a992834085e745dc (patch)
tree4dd93f9871c1ff05212652a1e4709414a4881f1d /mm
parent83ef99befc324803a54cf2a5fab5a322df3a99d6 (diff)
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 <cesarb@cesarb.net> Tested-by: Eric B Munson <emunson@mgebm.net> Acked-by: Eric B Munson <emunson@mgebm.net> Reviewed-by: Jesper Juhl <jj@chaosbits.net> Reviewed-by: Pekka Enberg <penberg@kernel.org> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Hugh Dickins <hughd@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/swapfile.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index b261e55e0b8..e4dc94996c5 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;
}