Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sys_swapon: simplify error flow in alloc_swap_info()

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

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>
This commit is contained in:
Cesar Eduardo Barros 2011-03-22 16:33:19 -07:00 committed by Linus Torvalds
parent 2542e5134d
commit 730c0581c8
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mm/swapfile.c
View File

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