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

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

sys_swapon: simplify error flow in setup_swap_map_and_extents() 



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 avatarPekka Enberg <penberg@kernel.org>
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 915d4d7b

mm/swapfile.c

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