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

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

sys_swapon: remove nr_good_pages variable 



It still exists within setup_swap_map_and_extents(), but after it
nr_good_pages == p->pages.

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 bdb8e3f6

mm/swapfile.c

+3 −5
Original line number Diff line number Diff line
@@ -2039,7 +2039,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
	int i, prev;

	int error;

	union swap_header *swap_header;

	unsigned int nr_good_pages;

	int nr_extents;

	sector_t span;

	unsigned long maxpages;
@@ -2123,7 +2122,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
		error = nr_extents;

		goto bad_swap;

	}

	nr_good_pages = p->pages;



	if (p->bdev) {

		if (blk_queue_nonrot(bdev_get_queue(p->bdev))) {
@@ -2143,12 +2141,12 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
		p->prio = --least_priority;

	p->swap_map = swap_map;

	p->flags |= SWP_WRITEOK;

	nr_swap_pages += nr_good_pages;

	total_swap_pages += nr_good_pages;

	nr_swap_pages += p->pages;

	total_swap_pages += p->pages;



	printk(KERN_INFO "Adding %uk swap on %s.  "

			"Priority:%d extents:%d across:%lluk %s%s\n",

		nr_good_pages<<(PAGE_SHIFT-10), name, p->prio,

		p->pages<<(PAGE_SHIFT-10), name, p->prio,

		nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),

		(p->flags & SWP_SOLIDSTATE) ? "SS" : "",

		(p->flags & SWP_DISCARDABLE) ? "D" : "");