Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752568AbbKXGYw (ORCPT ); Tue, 24 Nov 2015 01:24:52 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35080 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752034AbbKXGYv (ORCPT ); Tue, 24 Nov 2015 01:24:51 -0500 From: Joonsoo Kim X-Google-Original-From: Joonsoo Kim To: Andrew Morton Cc: Vlastimil Babka , Mel Gorman , Yaowei Bai , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Joonsoo Kim Subject: [PATCH] mm/compaction: __compact_pgdat() code cleanuup Date: Tue, 24 Nov 2015 15:24:42 +0900 Message-Id: <1448346282-5435-1-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1350 Lines: 45 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 --- 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); } } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/