From b18f20b6d79a138d940d85c33da10ec5cf9aff8c Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Fri, 28 Sep 2012 10:20:00 +1000 Subject: [PATCH] cma: decrease cc.nr_migratepages after reclaiming pagelist reclaim_clean_pages_from_list() reclaims clean pages before migration so cc.nr_migratepages should be updated. Currently, there is no problem but it can be wrong if we try to use the value in future. Signed-off-by: Minchan Kim Cc: Mel Gorman Cc: Michal Nazarewicz Cc: Bartlomiej Zolnierkiewicz Cc: Marek Szyprowski Signed-off-by: Andrew Morton --- mm/page_alloc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ddc155300a67..8e1be1c4bbbf 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5672,7 +5672,7 @@ static unsigned long pfn_max_align_up(unsigned long pfn) static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) { /* This function is based on compact_zone() from compaction.c. */ - + unsigned long nr_reclaimed; unsigned long pfn = start; unsigned int tries = 0; int ret = 0; @@ -5708,7 +5708,9 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) break; } - reclaim_clean_pages_from_list(cc.zone, &cc.migratepages); + nr_reclaimed = reclaim_clean_pages_from_list(cc.zone, + &cc.migratepages); + cc.nr_migratepages -= nr_reclaimed; ret = migrate_pages(&cc.migratepages, alloc_migrate_target, -- 2.39.2