Rename check function and move one outer condition check to this function. There is no functional change.
Signed-off-by: Joonsoo Kim <[email protected]> --- 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
