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

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

sys_swapon: simplify error flow in alloc_swap_info() 



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 avatarPekka Enberg <penberg@kernel.org>
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 2542e513

mm/swapfile.c

+1 −6
Original line number Diff line number Diff line
@@ -1848,7 +1848,6 @@ static struct swap_info_struct *alloc_swap_info(void) 
{

	struct swap_info_struct *p;

	unsigned int type;

	int error;



	p = kzalloc(sizeof(*p), GFP_KERNEL);

	if (!p)
@@ -1859,11 +1858,10 @@ static struct swap_info_struct *alloc_swap_info(void) 
		if (!(swap_info[type]->flags & SWP_USED))

			break;

	}

	error = -EPERM;

	if (type >= MAX_SWAPFILES) {

		spin_unlock(&swap_lock);

		kfree(p);

		goto out;

		return ERR_PTR(-EPERM);

	}

	if (type >= nr_swapfiles) {

		p->type = type;
@@ -1889,9 +1887,6 @@ static struct swap_info_struct *alloc_swap_info(void) 
	spin_unlock(&swap_lock);



	return p;



out:

	return ERR_PTR(error);

}



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