Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932220AbbFYAnN (ORCPT ); Wed, 24 Jun 2015 20:43:13 -0400 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:55827 "EHLO lgemrelse7q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171AbbFYAmy (ORCPT ); Wed, 24 Jun 2015 20:42:54 -0400 X-Original-SENDERIP: 10.177.222.220 X-Original-MAILFROM: iamjoonsoo.kim@lge.com From: Joonsoo Kim To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Vlastimil Babka , Mel Gorman , Rik van Riel , David Rientjes , Minchan Kim , Joonsoo Kim Subject: [RFC PATCH 04/10] mm/compaction: clean-up restarting condition check Date: Thu, 25 Jun 2015 09:45:15 +0900 Message-Id: <1435193121-25880-5-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435193121-25880-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1435193121-25880-1-git-send-email-iamjoonsoo.kim@lge.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1418 Lines: 42 Rename check function and move one outer condition check to this function. There is no functional change. Signed-off-by: Joonsoo Kim --- mm/compaction.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 2d8e211..dd2063b 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -188,8 +188,11 @@ void compaction_defer_reset(struct zone *zone, int order, } /* Returns true if restarting compaction after many failures */ -bool compaction_restarting(struct zone *zone, int order) +static bool compaction_direct_restarting(struct zone *zone, int order) { + if (current_is_kswapd()) + return false; + if (order < zone->compact_order_failed) return false; @@ -1327,7 +1330,7 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) * is about to be retried after being deferred. kswapd does not do * this reset as it'll reset the cached information when going to sleep. */ - if (compaction_restarting(zone, cc->order) && !current_is_kswapd()) + if (compaction_direct_restarting(zone, cc->order)) __reset_isolation_suitable(zone); /* -- 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/