On Tue, Nov 24, 2015 at 03:24:42PM +0900, Joonsoo Kim wrote: > This patch uses is_via_compact_memory() to distinguish direct compaction. > And it also reduces indentation on compaction_defer_reset > by filtering failure case. There is no functional change. > > Signed-off-by: Joonsoo Kim <iamjoonsoo....@lge.com> > --- > mm/compaction.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/mm/compaction.c b/mm/compaction.c > index de3e1e7..2b1a15e 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -1658,14 +1658,17 @@ static void __compact_pgdat(pg_data_t *pgdat, struct > compact_control *cc) > !compaction_deferred(zone, cc->order)) > compact_zone(zone, cc); > > - if (cc->order > 0) { > - if (zone_watermark_ok(zone, cc->order, > - low_wmark_pages(zone), 0, 0)) > - compaction_defer_reset(zone, cc->order, false); > - } > - > 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, > + low_wmark_pages(zone), 0, 0)) > + continue; > + > + compaction_defer_reset(zone, cc->order, false); > } > }
This makes more sense, Acked-by: Yaowei Bai <baiyao...@cmss.chinamobile.com> > > -- > 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/