mm: use two zonelist that are filtered by GFP mask

[mirror_ubuntu-artful-kernel.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 03927cb5ec9e119ca06cf337d69de017303d82ba..29851841da62e44d8ea3c7ce361c5adb9cab2f12 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3243,14 +3243,15 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
        struct zonelist *zonelist;
        gfp_t local_flags;
        struct zone **z;
+       struct zone *zone;
+       enum zone_type high_zoneidx = gfp_zone(flags);
        void *obj = NULL;
        int nid;
 
        if (flags & __GFP_THISNODE)
                return NULL;
 
-       zonelist = &NODE_DATA(slab_node(current->mempolicy))
-                       ->node_zonelists[gfp_zone(flags)];
+       zonelist = node_zonelist(slab_node(current->mempolicy), flags);
        local_flags = flags & (GFP_CONSTRAINT_MASK|GFP_RECLAIM_MASK);
 
 retry:
@@ -3258,10 +3259,10 @@ retry:
         * Look through allowed nodes for objects available
         * from existing per node queues.
         */
-       for (z = zonelist->zones; *z && !obj; z++) {
-               nid = zone_to_nid(*z);
+       for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
+               nid = zone_to_nid(zone);
 
-               if (cpuset_zone_allowed_hardwall(*z, flags) &&
+               if (cpuset_zone_allowed_hardwall(zone, flags) &&
                        cache->nodelists[nid] &&
                        cache->nodelists[nid]->free_objects)
                                obj = ____cache_alloc_node(cache,