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

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

sys_swapon: simplify error flow in claim_swapfile() 



Since there is no cleanup to do, there is no reason to jump to a label.
Return directly instead.

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 4d0e1e10

mm/swapfile.c

+6 −14
Original line number Diff line number Diff line
@@ -1900,30 +1900,22 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode) 
				   sys_swapon);

		if (error < 0) {

			p->bdev = NULL;

			error = -EINVAL;

			goto bad_swap;

			return -EINVAL;

		}

		p->old_block_size = block_size(p->bdev);

		error = set_blocksize(p->bdev, PAGE_SIZE);

		if (error < 0)

			goto bad_swap;

			return error;

		p->flags |= SWP_BLKDEV;

	} else if (S_ISREG(inode->i_mode)) {

		p->bdev = inode->i_sb->s_bdev;

		mutex_lock(&inode->i_mutex);

		if (IS_SWAPFILE(inode)) {

			error = -EBUSY;

			goto bad_swap;

		}

	} else {

		error = -EINVAL;

		goto bad_swap;

	}

		if (IS_SWAPFILE(inode))

			return -EBUSY;

	} else

		return -EINVAL;



	return 0;



bad_swap:

	return error;

}



SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)