Commit 27ac81d8 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Linus Torvalds

mm/vmscan: push lruvec pointer into putback_inactive_pages()

As zone_reclaim_stat is now located in the lruvec, we can reach it
directly.
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarHugh 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 95d918fc
...@@ -1155,11 +1155,11 @@ static int too_many_isolated(struct zone *zone, int file, ...@@ -1155,11 +1155,11 @@ static int too_many_isolated(struct zone *zone, int file,
} }
static noinline_for_stack void static noinline_for_stack void
putback_inactive_pages(struct mem_cgroup_zone *mz, putback_inactive_pages(struct lruvec *lruvec,
struct list_head *page_list) struct list_head *page_list)
{ {
struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz); struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat;
struct zone *zone = mz->zone; struct zone *zone = lruvec_zone(lruvec);
LIST_HEAD(pages_to_free); LIST_HEAD(pages_to_free);
/* /*
...@@ -1278,7 +1278,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz, ...@@ -1278,7 +1278,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz,
nr_reclaimed); nr_reclaimed);
} }
putback_inactive_pages(mz, &page_list); putback_inactive_pages(lruvec, &page_list);
__mod_zone_page_state(zone, NR_ISOLATED_ANON + file, -nr_taken); __mod_zone_page_state(zone, NR_ISOLATED_ANON + file, -nr_taken);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment