* [merged] mm-when-migrate_pages-returns-0-all-pages-must-have-been-released.patch removed from -mm tree
@ 2011-02-03 19:45 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2011-02-03 19:45 UTC (permalink / raw)
To: aarcange, cl, mel, minchan.kim, mm-commits
The patch titled
mm: when migrate_pages returns 0, all pages must have been released
has been removed from the -mm tree. Its filename was
mm-when-migrate_pages-returns-0-all-pages-must-have-been-released.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm: when migrate_pages returns 0, all pages must have been released
From: Andrea Arcangeli <aarcange@redhat.com>
In some cases migrate_pages could return zero while still leaving a few
pages in the pagelist (and some caller wouldn't notice it has to call
putback_lru_pages after commit cf608ac19c9 ("mm: compaction: fix
COMPACTPAGEFAILED counting")).
Add one missing putback_lru_pages not added by commit cf608ac19c95 ("mm:
compaction: fix COMPACTPAGEFAILED counting").
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Minchan Kim <minchan.kim@gmail.com>
Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
Cc: Christoph Lameter <cl@linux.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/memory-failure.c | 1 +
mm/migrate.c | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/memory-failure.c~mm-when-migrate_pages-returns-0-all-pages-must-have-been-released mm/memory-failure.c
--- a/mm/memory-failure.c~mm-when-migrate_pages-returns-0-all-pages-must-have-been-released
+++ a/mm/memory-failure.c
@@ -1419,6 +1419,7 @@ int soft_offline_page(struct page *page,
ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL,
0, true);
if (ret) {
+ putback_lru_pages(&pagelist);
pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
pfn, ret, page->flags);
if (ret > 0)
diff -puN mm/migrate.c~mm-when-migrate_pages-returns-0-all-pages-must-have-been-released mm/migrate.c
--- a/mm/migrate.c~mm-when-migrate_pages-returns-0-all-pages-must-have-been-released
+++ a/mm/migrate.c
@@ -772,6 +772,7 @@ uncharge:
unlock:
unlock_page(page);
+move_newpage:
if (rc != -EAGAIN) {
/*
* A page that has been migrated has all references
@@ -785,8 +786,6 @@ unlock:
putback_lru_page(page);
}
-move_newpage:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-03 19:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-03 19:45 [merged] mm-when-migrate_pages-returns-0-all-pages-must-have-been-released.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.