1 files changed, 30 insertions, 34 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 4046434046e6..eceac9f9032f 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1246,17 +1246,16 @@ static unsigned long shrink_zone(int priority, struct zone *zone,
  * If a zone is deemed to be full of pinned pages then just give it a light
  * scan then give up on it.
  */
-static unsigned long shrink_zones(int priority, struct zone **zones,
+static unsigned long shrink_zones(int priority, struct zonelist *zonelist,
                                         struct scan_control *sc)
 {
+        enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
         unsigned long nr_reclaimed = 0;
-        int i;
-
+        struct zoneref *z;
+        struct zone *zone;
 
         sc->all_unreclaimable = 1;
-        for (i = 0; zones[i] != NULL; i++) {
-                struct zone *zone = zones[i];
-
+        for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
                 if (!populated_zone(zone))
                         continue;
                 /*
@@ -1301,8 +1300,8 @@ static unsigned long shrink_zones(int priority, struct zone **zones,
  * holds filesystem locks which prevent writeout this might not work, and the
  * allocation attempt will fail.
  */
-static unsigned long do_try_to_free_pages(struct zone **zones, gfp_t gfp_mask,
-                                          struct scan_control *sc)
+static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
+                                        struct scan_control *sc)
 {
         int priority;
         int ret = 0;
@@ -1310,7 +1309,9 @@ static unsigned long do_try_to_free_pages(struct zone **zones, gfp_t gfp_mask,
         unsigned long nr_reclaimed = 0;
         struct reclaim_state *reclaim_state = current->reclaim_state;
         unsigned long lru_pages = 0;
-        int i;
+        struct zoneref *z;
+        struct zone *zone;
+        enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
 
         if (scan_global_lru(sc))
                 count_vm_event(ALLOCSTALL);
@@ -1318,8 +1319,7 @@ static unsigned long do_try_to_free_pages(struct zone **zones, gfp_t gfp_mask,
          * mem_cgroup will not do shrink_slab.
          */
         if (scan_global_lru(sc)) {
-                for (i = 0; zones[i] != NULL; i++) {
-                        struct zone *zone = zones[i];
+                for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
 
                         if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                                 continue;
@@ -1333,13 +1333,13 @@ static unsigned long do_try_to_free_pages(struct zone **zones, gfp_t gfp_mask,
                 sc->nr_scanned = 0;
                 if (!priority)
                         disable_swap_token();
-                nr_reclaimed += shrink_zones(priority, zones, sc);
+                nr_reclaimed += shrink_zones(priority, zonelist, sc);
                 /*
                  * Don't shrink slabs when reclaiming memory from
                  * over limit cgroups
                  */
                 if (scan_global_lru(sc)) {
-                        shrink_slab(sc->nr_scanned, gfp_mask, lru_pages);
+                        shrink_slab(sc->nr_scanned, sc->gfp_mask, lru_pages);
                         if (reclaim_state) {
                                 nr_reclaimed += reclaim_state->reclaimed_slab;
                                 reclaim_state->reclaimed_slab = 0;
@@ -1383,8 +1383,7 @@ out:
                 priority = 0;
 
         if (scan_global_lru(sc)) {
-                for (i = 0; zones[i] != NULL; i++) {
-                        struct zone *zone = zones[i];
+                for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
 
                         if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                                 continue;
@@ -1397,7 +1396,8 @@ out:
         return ret;
 }
 
-unsigned long try_to_free_pages(struct zone **zones, int order, gfp_t gfp_mask)
+unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
+                                                                gfp_t gfp_mask)
 {
         struct scan_control sc = {
                 .gfp_mask = gfp_mask,
@@ -1410,7 +1410,7 @@ unsigned long try_to_free_pages(struct zone **zones, int order, gfp_t gfp_mask)
                 .isolate_pages = isolate_pages_global,
         };
 
-        return do_try_to_free_pages(zones, gfp_mask, &sc);
+        return do_try_to_free_pages(zonelist, &sc);
 }
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
@@ -1419,7 +1419,6 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
                                                 gfp_t gfp_mask)
 {
         struct scan_control sc = {
-                .gfp_mask = gfp_mask,
                 .may_writepage = !laptop_mode,
                 .may_swap = 1,
                 .swap_cluster_max = SWAP_CLUSTER_MAX,
@@ -1428,13 +1427,12 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
                 .mem_cgroup = mem_cont,
                 .isolate_pages = mem_cgroup_isolate_pages,
         };
-        struct zone **zones;
-        int target_zone = gfp_zone(GFP_HIGHUSER_MOVABLE);
+        struct zonelist *zonelist;
 
-        zones = NODE_DATA(numa_node_id())->node_zonelists[target_zone].zones;
-        if (do_try_to_free_pages(zones, sc.gfp_mask, &sc))
-                return 1;
-        return 0;
+        sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
+                        (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);
+        zonelist = NODE_DATA(numa_node_id())->node_zonelists;
+        return do_try_to_free_pages(zonelist, &sc);
 }
 #endif
 
@@ -1647,11 +1645,10 @@ static int kswapd(void *p)
         struct reclaim_state reclaim_state = {
                 .reclaimed_slab = 0,
         };
-        cpumask_t cpumask;
+        node_to_cpumask_ptr(cpumask, pgdat->node_id);
 
-        cpumask = node_to_cpumask(pgdat->node_id);
-        if (!cpus_empty(cpumask))
-                set_cpus_allowed(tsk, cpumask);
+        if (!cpus_empty(*cpumask))
+                set_cpus_allowed_ptr(tsk, cpumask);
         current->reclaim_state = &reclaim_state;
 
         /*
@@ -1880,17 +1877,16 @@ out:
 static int __devinit cpu_callback(struct notifier_block *nfb,
                                   unsigned long action, void *hcpu)
 {
-        pg_data_t *pgdat;
-        cpumask_t mask;
         int nid;
 
         if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
                 for_each_node_state(nid, N_HIGH_MEMORY) {
-                        pgdat = NODE_DATA(nid);
-                        mask = node_to_cpumask(pgdat->node_id);
-                        if (any_online_cpu(mask) != NR_CPUS)
+                        pg_data_t *pgdat = NODE_DATA(nid);
+                        node_to_cpumask_ptr(mask, pgdat->node_id);
+
+                        if (any_online_cpu(*mask) < nr_cpu_ids)
                                 /* One of our CPUs online: restore mask */
-                                set_cpus_allowed(pgdat->kswapd, mask);
+                                set_cpus_allowed_ptr(pgdat->kswapd, mask);
                 }
         }
         return NOTIFY_OK;