sys_swapon: simplify error flow in read_swap_header()
Cesar Eduardo Barros [Tue, 22 Mar 2011 23:33:30 +0000 (16:33 -0700)]
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: 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>

mm/swapfile.c

index 5e13bff..058a9df 100644 (file)
@@ -1928,7 +1928,7 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
 
        if (memcmp("SWAPSPACE2", swap_header->magic.magic, 10)) {
                printk(KERN_ERR "Unable to find swap-space signature\n");
-               goto bad_swap;
+               return 0;
        }
 
        /* swap partition endianess hack... */
@@ -1944,7 +1944,7 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
                printk(KERN_WARNING
                       "Unable to handle swap header version %d\n",
                       swap_header->info.version);
-               goto bad_swap;
+               return 0;
        }
 
        p->lowest_bit  = 1;
@@ -1976,22 +1976,19 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
        p->highest_bit = maxpages - 1;
 
        if (!maxpages)
-               goto bad_swap;
+               return 0;
        swapfilepages = i_size_read(inode) >> PAGE_SHIFT;
        if (swapfilepages && maxpages > swapfilepages) {
                printk(KERN_WARNING
                       "Swap area shorter than signature indicates\n");
-               goto bad_swap;
+               return 0;
        }
        if (swap_header->info.nr_badpages && S_ISREG(inode->i_mode))
-               goto bad_swap;
+               return 0;
        if (swap_header->info.nr_badpages > MAX_SWAP_BADPAGES)
-               goto bad_swap;
+               return 0;
 
        return maxpages;
-
-bad_swap:
-       return 0;
 }
 
 SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)