summaryrefslogtreecommitdiffstats
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2011-03-22 16:33:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 17:44:08 -0700
commit9c8100ef26ba9012b8677a383179a0cf169fc7f3 (patch)
tree6ff570c8373dbb90b47345b2adc0b0c9c9b11001 /mm/swapfile.c
parentbdb8e3f68320f897de3f3a4c363fe2802037f21d (diff)
downloadlinux-9c8100ef26ba9012b8677a383179a0cf169fc7f3.tar.gz
linux-9c8100ef26ba9012b8677a383179a0cf169fc7f3.tar.bz2
linux-9c8100ef26ba9012b8677a383179a0cf169fc7f3.zip
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: Cesar Eduardo Barros <cesarb@cesarb.net> Tested-by: Eric B Munson <emunson@mgebm.net> Acked-by: Eric B Munson <emunson@mgebm.net> Reviewed-by: Pekka Enberg <penberg@kernel.org> 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>
Diffstat (limited to 'mm/swapfile.c')
-rw-r--r--mm/swapfile.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index be0d0a28690e..9e3613b91612 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -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" : "");