summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mm/swapfile.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index a0f39f9dc5a5..be0d0a28690e 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1998,7 +1998,6 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,
sector_t *span)
{
int i;
- int error;
unsigned int nr_good_pages;
int nr_extents;
@@ -2006,10 +2005,8 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,
for (i = 0; i < swap_header->info.nr_badpages; i++) {
unsigned int page_nr = swap_header->info.badpages[i];
- if (page_nr == 0 || page_nr > swap_header->info.last_page) {
- error = -EINVAL;
- goto bad_swap;
- }
+ if (page_nr == 0 || page_nr > swap_header->info.last_page)
+ return -EINVAL;
if (page_nr < maxpages) {
swap_map[page_nr] = SWAP_MAP_BAD;
nr_good_pages--;
@@ -2021,22 +2018,16 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,
p->max = maxpages;
p->pages = nr_good_pages;
nr_extents = setup_swap_extents(p, span);
- if (nr_extents < 0) {
- error = nr_extents;
- goto bad_swap;
- }
+ if (nr_extents < 0)
+ return nr_extents;
nr_good_pages = p->pages;
}
if (!nr_good_pages) {
printk(KERN_WARNING "Empty swap-file\n");
- error = -EINVAL;
- goto bad_swap;
+ return -EINVAL;
}
return nr_extents;
-
-bad_swap:
- return error;
}
SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)