Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit bd69010b042a60ca41a890df1b10019e94746c2f

Authored by Cesar Eduardo Barros
Committed by Linus Torvalds
1 parent 9b01c350af
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

... ... @@ -1918,13 +1918,13 @@
1918 1918 if (IS_ERR(name)) {
1919 1919 error = PTR_ERR(name);
1920 1920 name = NULL;
1921   - goto bad_swap_2;
  1921 + goto bad_swap;
1922 1922 }
1923 1923 swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0);
1924 1924 if (IS_ERR(swap_file)) {
1925 1925 error = PTR_ERR(swap_file);
1926 1926 swap_file = NULL;
1927   - goto bad_swap_2;
  1927 + goto bad_swap;
1928 1928 }
1929 1929  
1930 1930 p->swap_file = swap_file;
1931 1931  
... ... @@ -2141,13 +2141,12 @@
2141 2141 error = 0;
2142 2142 goto out;
2143 2143 bad_swap:
2144   - if (S_ISBLK(inode->i_mode) && p->bdev) {
  2144 + if (inode && S_ISBLK(inode->i_mode) && p->bdev) {
2145 2145 set_blocksize(p->bdev, p->old_block_size);
2146 2146 blkdev_put(p->bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL);
2147 2147 }
2148 2148 destroy_swap_extents(p);
2149 2149 swap_cgroup_swapoff(p->type);
2150   -bad_swap_2:
2151 2150 spin_lock(&swap_lock);
2152 2151 p->swap_file = NULL;
2153 2152 p->flags = 0;