1 files changed, 6 insertions, 20 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 1d251b5b0a06..4c5453f8427d 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -94,11 +94,6 @@ struct scan_control {
         nodemask_t      *nodemask;
 };
 
-struct mem_cgroup_zone {
-        struct mem_cgroup *mem_cgroup;
-        struct zone *zone;
-};
-
 #define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru))
 
 #ifdef ARCH_HAS_PREFETCH
@@ -1769,8 +1764,7 @@ static inline bool should_continue_reclaim(struct lruvec *lruvec,
 /*
  * This is a basic per-zone page freer.  Used by both kswapd and direct reclaim.
  */
-static void shrink_mem_cgroup_zone(struct mem_cgroup_zone *mz,
-                                   struct scan_control *sc)
+static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
 {
         unsigned long nr[NR_LRU_LISTS];
         unsigned long nr_to_scan;
@@ -1778,9 +1772,6 @@ static void shrink_mem_cgroup_zone(struct mem_cgroup_zone *mz,
         unsigned long nr_reclaimed, nr_scanned;
         unsigned long nr_to_reclaim = sc->nr_to_reclaim;
         struct blk_plug plug;
-        struct lruvec *lruvec;
-
-        lruvec = mem_cgroup_zone_lruvec(mz->zone, mz->mem_cgroup);
 
 restart:
         nr_reclaimed = 0;
@@ -1842,12 +1833,10 @@ static void shrink_zone(struct zone *zone, struct scan_control *sc)
 
         memcg = mem_cgroup_iter(root, NULL, &reclaim);
         do {
-                struct mem_cgroup_zone mz = {
-                        .mem_cgroup = memcg,
-                        .zone = zone,
-                };
+                struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, memcg);
+
+                shrink_lruvec(lruvec, sc);
 
-                shrink_mem_cgroup_zone(&mz, sc);
                 /*
                  * Limit reclaim has historically picked one memcg and
                  * scanned it with decreasing priority levels until
@@ -2172,10 +2161,7 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *memcg,
                 .priority = 0,
                 .target_mem_cgroup = memcg,
         };
-        struct mem_cgroup_zone mz = {
-                .mem_cgroup = memcg,
-                .zone = zone,
-        };
+        struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, memcg);
 
         sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
                         (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);
@@ -2191,7 +2177,7 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *memcg,
          * will pick up pages from other mem cgroup's as well. We hack
          * the priority and make it zero.
          */
-        shrink_mem_cgroup_zone(&mz, &sc);
+        shrink_lruvec(lruvec, &sc);
 
         trace_mm_vmscan_memcg_softlimit_reclaim_end(sc.nr_reclaimed);