Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9c8100ef26ba9012b8677a383179a0cf169fc7f3

Authored by Cesar Eduardo Barros
Committed by Linus Torvalds
1 parent bdb8e3f683
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 5 deletions Side-by-side Diff

... ... @@ -2039,7 +2039,6 @@
2039 2039 int i, prev;
2040 2040 int error;
2041 2041 union swap_header *swap_header;
2042   - unsigned int nr_good_pages;
2043 2042 int nr_extents;
2044 2043 sector_t span;
2045 2044 unsigned long maxpages;
... ... @@ -2123,7 +2122,6 @@
2123 2122 error = nr_extents;
2124 2123 goto bad_swap;
2125 2124 }
2126   - nr_good_pages = p->pages;
2127 2125  
2128 2126 if (p->bdev) {
2129 2127 if (blk_queue_nonrot(bdev_get_queue(p->bdev))) {
2130 2128  
... ... @@ -2143,12 +2141,12 @@
2143 2141 p->prio = --least_priority;
2144 2142 p->swap_map = swap_map;
2145 2143 p->flags |= SWP_WRITEOK;
2146   - nr_swap_pages += nr_good_pages;
2147   - total_swap_pages += nr_good_pages;
  2144 + nr_swap_pages += p->pages;
  2145 + total_swap_pages += p->pages;
2148 2146  
2149 2147 printk(KERN_INFO "Adding %uk swap on %s. "
2150 2148 "Priority:%d extents:%d across:%lluk %s%s\n",
2151   - nr_good_pages<<(PAGE_SHIFT-10), name, p->prio,
  2149 + p->pages<<(PAGE_SHIFT-10), name, p->prio,
2152 2150 nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),
2153 2151 (p->flags & SWP_SOLIDSTATE) ? "SS" : "",
2154 2152 (p->flags & SWP_DISCARDABLE) ? "D" : "");