redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sys_swapon: use a single error label 

sys_swapon currently has two error labels, bad_swap and bad_swap_2.
bad_swap does the same as bad_swap_2 plus destroy_swap_extents() and
swap_cgroup_swapoff(); both are noops in the places where bad_swap_2 is
jumped to. With a single extra test for inode (matching the one in the
S_ISREG case below), all the error paths in the function can go to
bad_swap.

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: 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>
hifive-unleashed-5.1
Cesar Eduardo Barros 2011-03-22 16:33:25 -07:00 committed by Linus Torvalds
parent 9b01c350af
commit bd69010b04
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mm/swapfile.c
View File

@ -1918,13 +1918,13 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
if (IS_ERR(name)) { if (IS_ERR(name)) {
error = PTR_ERR(name); error = PTR_ERR(name);
name = NULL; name = NULL;
goto bad_swap_2; goto bad_swap;
} }
swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0); swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0);
if (IS_ERR(swap_file)) { if (IS_ERR(swap_file)) {
error = PTR_ERR(swap_file); error = PTR_ERR(swap_file);
swap_file = NULL; swap_file = NULL;
goto bad_swap_2; goto bad_swap;
} }
p->swap_file = swap_file; p->swap_file = swap_file;
@ -2141,13 +2141,12 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
error = 0; error = 0;
goto out; goto out;
bad_swap: bad_swap:
if (S_ISBLK(inode->i_mode) && p->bdev) { if (inode && S_ISBLK(inode->i_mode) && p->bdev) {
set_blocksize(p->bdev, p->old_block_size); set_blocksize(p->bdev, p->old_block_size);
blkdev_put(p->bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL); blkdev_put(p->bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL);
} }
destroy_swap_extents(p); destroy_swap_extents(p);
swap_cgroup_swapoff(p->type); swap_cgroup_swapoff(p->type);
bad_swap_2:
spin_lock(&swap_lock); spin_lock(&swap_lock);
p->swap_file = NULL; p->swap_file = NULL;
p->flags = 0; p->flags = 0;