Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd69010b authored by Cesar Eduardo Barros's avatar Cesar Eduardo Barros Committed by Linus Torvalds
Browse files

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: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
Tested-by: default avatarEric B Munson <emunson@mgebm.net>
Acked-by: default avatarEric B Munson <emunson@mgebm.net>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9b01c350

mm/swapfile.c

+3 −4
Original line number Diff line number Diff line
@@ -1918,13 +1918,13 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
	if (IS_ERR(name)) {

		error = PTR_ERR(name);

		name = NULL;

		goto bad_swap_2;

		goto bad_swap;

	}

	swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0);

	if (IS_ERR(swap_file)) {

		error = PTR_ERR(swap_file);

		swap_file = NULL;

		goto bad_swap_2;

		goto bad_swap;

	}



	p->swap_file = swap_file;
@@ -2141,13 +2141,12 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
	error = 0;

	goto out;

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);

		blkdev_put(p->bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL);

	}

	destroy_swap_extents(p);

	swap_cgroup_swapoff(p->type);

bad_swap_2:

	spin_lock(&swap_lock);

	p->swap_file = NULL;

	p->flags = 0;