Commit 2542e513 authored Mar 22, 2011 by Cesar Eduardo Barros Committed by Linus Torvalds Mar 22, 2011

sys_swapon: simplify error return from swap_info allocation



At this point in sys_swapon, there is nothing to free. Return directly
instead of jumping to the cleanup block at the end of the function.

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: 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>

parent 53cbb243

mm/swapfile.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1918,10 +1918,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
	return -EPERM;		return -EPERM;

	p = alloc_swap_info();		p = alloc_swap_info();
	if (IS_ERR(p)) {		if (IS_ERR(p))
	error = PTR_ERR(p);		return PTR_ERR(p);
	goto out;
	}

	name = getname(specialfile);		name = getname(specialfile);
	error = PTR_ERR(name);		error = PTR_ERR(name);