On 3.12.2015 5:10, Joonsoo Kim wrote:
> 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.
>
> Acked-by: Yaowei Bai <baiyaowei@xxxxxxxxxxxxxxxxxxxx>
> Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Acked-by: Vlastimil Babka <vbabka@xxxxxxx>
> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
> ---
> mm/compaction.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/mm/compaction.c b/mm/compaction.c
> index de3e1e7..01b1e5e 100644
> --- a/mm/compaction.c
> +++ b/mm/compaction.c
> @@ -1658,14 +1658,15 @@ 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))
> + compaction_defer_reset(zone, cc->order, false);
> }
> }
>
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>