lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sys_swapon: move setting of error nearer use

Browse Source 
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>
This commit is contained in:
Cesar Eduardo Barros
2011-03-22 16:33:22 -07:00
committed by Linus Torvalds
parent 83ef99befc
commit 7de7fb6b34
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mm/swapfile.c
View File

@@ -1916,14 +1916,14 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
return PTR_ERR(p); return PTR_ERR(p);
name = getname(specialfile); name = getname(specialfile);
error = PTR_ERR(name);
if (IS_ERR(name)) { if (IS_ERR(name)) {
error = PTR_ERR(name);
name = NULL; name = NULL;
goto bad_swap_2; goto bad_swap_2;
} }
swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0); swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0);
error = PTR_ERR(swap_file);
if (IS_ERR(swap_file)) { if (IS_ERR(swap_file)) {
error = PTR_ERR(swap_file);
swap_file = NULL; swap_file = NULL;
goto bad_swap_2; goto bad_swap_2;
} }
@@ -1932,17 +1932,17 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
mapping = swap_file->f_mapping; mapping = swap_file->f_mapping;
inode = mapping->host; inode = mapping->host;
error = -EBUSY;
for (i = 0; i < nr_swapfiles; i++) { for (i = 0; i < nr_swapfiles; i++) {
struct swap_info_struct *q = swap_info[i]; struct swap_info_struct *q = swap_info[i];
if (q == p || !q->swap_file) if (q == p || !q->swap_file)
continue; continue;
if (mapping == q->swap_file->f_mapping) if (mapping == q->swap_file->f_mapping) {
error = -EBUSY;
goto bad_swap; goto bad_swap;
} }
}
error = -EINVAL;
if (S_ISBLK(inode->i_mode)) { if (S_ISBLK(inode->i_mode)) {
bdev = bdgrab(I_BDEV(inode)); bdev = bdgrab(I_BDEV(inode));
error = blkdev_get(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL, 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; goto bad_swap;
} }
} else { } else {
error = -EINVAL;
goto bad_swap; goto bad_swap;
} }