Commit 75469345 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds

mm/compaction.c: __compact_pgdat() code cleanuup

This patch uses is_via_compact_memory() to distinguish compaction from
sysfs or sysctl.  And, this patch also reduces indentation on
compaction_defer_reset() by filtering these cases first before checking
watermark.

There is no functional change.
Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: default avatarYaowei Bai <baiyaowei@cmss.chinamobile.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a8ae4991
...@@ -1658,15 +1658,16 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc) ...@@ -1658,15 +1658,16 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
!compaction_deferred(zone, cc->order)) !compaction_deferred(zone, cc->order))
compact_zone(zone, cc); compact_zone(zone, cc);
if (cc->order > 0) { VM_BUG_ON(!list_empty(&cc->freepages));
VM_BUG_ON(!list_empty(&cc->migratepages));
if (is_via_compact_memory(cc->order))
continue;
if (zone_watermark_ok(zone, cc->order, if (zone_watermark_ok(zone, cc->order,
low_wmark_pages(zone), 0, 0)) low_wmark_pages(zone), 0, 0))
compaction_defer_reset(zone, cc->order, false); compaction_defer_reset(zone, cc->order, false);
} }
VM_BUG_ON(!list_empty(&cc->freepages));
VM_BUG_ON(!list_empty(&cc->migratepages));
}
} }
void compact_pgdat(pg_data_t *pgdat, int order) void compact_pgdat(pg_data_t *pgdat, int order)
......
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