Skip to content

Commit

Permalink
sys_swapon: simplify error return from swap_info allocation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
cesarb authored and torvalds committed Mar 23, 2011
1 parent 53cbb24 commit 2542e51
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions mm/swapfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -1918,10 +1918,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
return -EPERM;

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

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

0 comments on commit 2542e51

Please sign in to comment.