Two variables are declared that are unnecessary in shrink_zone() as they already exist int the scan_control. Remove them Signed-off-by: Mel Gorman <mel@xxxxxxxxx> --- mm/vmscan.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index a374879..a232ad6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1633,8 +1633,6 @@ static void shrink_zone(struct zone *zone, struct scan_control *sc) { unsigned long nr[NR_LRU_LISTS]; unsigned long nr_to_scan; - unsigned long nr_reclaimed = sc->nr_reclaimed; - unsigned long nr_to_reclaim = sc->nr_to_reclaim; enum lru_list l; calc_scan_trybatch(zone, sc, nr); @@ -1647,7 +1645,7 @@ static void shrink_zone(struct zone *zone, struct scan_control *sc) nr[l], SWAP_CLUSTER_MAX); nr[l] -= nr_to_scan; - nr_reclaimed += shrink_list(l, nr_to_scan, + sc->nr_reclaimed += shrink_list(l, nr_to_scan, zone, sc); } } @@ -1659,13 +1657,11 @@ static void shrink_zone(struct zone *zone, struct scan_control *sc) * with multiple processes reclaiming pages, the total * freeing target can get unreasonably large. */ - if (nr_reclaimed >= nr_to_reclaim && + if (sc->nr_reclaimed >= sc->nr_to_reclaim && sc->priority < DEF_PRIORITY) break; } - sc->nr_reclaimed = nr_reclaimed; - /* * Even if we did not try to evict anon pages at all, we want to * rebalance the anon lru active/inactive ratio. -- 1.6.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>