redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sys_swapon: simplify error flow in read_swap_header() 

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>
hifive-unleashed-5.1
Cesar Eduardo Barros 2011-03-22 16:33:30 -07:00 committed by Linus Torvalds
parent ca8bd38bf6
commit 3871902538
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mm/swapfile.c
View 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)