CMA: make putback_lru_pages() call conditional

As per documentation and other places calling putback_lru_pages(), putback_lru_pages() is called on error only. Make the CMA code behave consistently. [[email protected]: remove a test-n-branch in the wrapup code] Signed-off-by: Srinivas Pandruvada <[email protected]> Acked-by: Michal Nazarewicz <[email protected]> Cc: Marek Szyprowski <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
oohal · Feb 24, 2013 · 2a6f512 · 2a6f512
1 parent ffb22af
commit 2a6f512
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
@@ -5806,9 +5806,11 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
 				    0, false, MIGRATE_SYNC,
 				    MR_CMA);
 	}
-
-	putback_movable_pages(&cc->migratepages);
-	return ret > 0 ? 0 : ret;
+	if (ret < 0) {
+		putback_movable_pages(&cc->migratepages);
+		return ret;
+	}
+	return 0;
 }
 
 /**