mm, compaction: pass gfp mask to compact_control

[deliverable/linux.git] / mm / compaction.c

diff --git a/mm/compaction.c b/mm/compaction.c
index b9cf751cc00ea890b8894a07d1441e994aad6220..15163b4b35ab8dda2c4367e9355a4be44f77d31a 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1032,8 +1032,8 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
        return cc->nr_migratepages ? ISOLATE_SUCCESS : ISOLATE_NONE;
 }
 
-static int compact_finished(struct zone *zone,
-                           struct compact_control *cc)
+static int compact_finished(struct zone *zone, struct compact_control *cc,
+                           const int migratetype)
 {
        unsigned int order;
        unsigned long watermark;
@@ -1079,7 +1079,7 @@ static int compact_finished(struct zone *zone,
                struct free_area *area = &zone->free_area[order];
 
                /* Job done if page is free of the right migratetype */
-               if (!list_empty(&area->free_list[cc->migratetype]))
+               if (!list_empty(&area->free_list[migratetype]))
                        return COMPACT_PARTIAL;
 
                /* Job done if allocation would set block type */
@@ -1145,6 +1145,7 @@ static int compact_zone(struct zone *zone, struct compact_control *cc)
        int ret;
        unsigned long start_pfn = zone->zone_start_pfn;
        unsigned long end_pfn = zone_end_pfn(zone);
+       const int migratetype = gfpflags_to_migratetype(cc->gfp_mask);
        const bool sync = cc->mode != MIGRATE_ASYNC;
 
        ret = compaction_suitable(zone, cc->order);
@@ -1187,7 +1188,8 @@ static int compact_zone(struct zone *zone, struct compact_control *cc)
 
        migrate_prep_local();
 
-       while ((ret = compact_finished(zone, cc)) == COMPACT_CONTINUE) {
+       while ((ret = compact_finished(zone, cc, migratetype)) ==
+                                               COMPACT_CONTINUE) {
                int err;
 
                switch (isolate_migratepages(zone, cc)) {
@@ -1242,7 +1244,7 @@ static unsigned long compact_zone_order(struct zone *zone, int order,
                .nr_freepages = 0,
                .nr_migratepages = 0,
                .order = order,
-               .migratetype = allocflags_to_migratetype(gfp_mask),
+               .gfp_mask = gfp_mask,
                .zone = zone,
                .mode = mode,
        };
@@ -1294,7 +1296,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist,
                return COMPACT_SKIPPED;
 
 #ifdef CONFIG_CMA
-       if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
+       if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
                alloc_flags |= ALLOC_CMA;
 #endif
        /* Compact each zone in the list */