diff options
| author | Cesar Eduardo Barros <cesarb@cesarb.net> | 2011-03-23 00:33:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 01:44:07 +0100 |
| commit | bd69010b042a60ca41a890df1b10019e94746c2f (patch) | |
| tree | 4064703903170911b09919f89b74a5bbe0d5ebfe /net | |
| parent | sys_swapon: do only cleanup in the cleanup blocks (diff) | |
| download | linux-bd69010b042a60ca41a890df1b10019e94746c2f.tar.xz linux-bd69010b042a60ca41a890df1b10019e94746c2f.zip | |
sys_swapon: use a single error label
sys_swapon currently has two error labels, bad_swap and bad_swap_2.
bad_swap does the same as bad_swap_2 plus destroy_swap_extents() and
swap_cgroup_swapoff(); both are noops in the places where bad_swap_2 is
jumped to. With a single extra test for inode (matching the one in the
S_ISREG case below), all the error paths in the function can go to
bad_swap.
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: 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>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions