Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38719025 authored by Cesar Eduardo Barros's avatar Cesar Eduardo Barros Committed by Linus Torvalds
Browse files

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: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
Tested-by: default avatarEric B Munson <emunson@mgebm.net>
Acked-by: default avatarEric B Munson <emunson@mgebm.net>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ca8bd38b

mm/swapfile.c

+6 −9
Original line number Diff line number Diff line
@@ -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)