---

yaml --- r: 232723 b: refs/heads/master c: 57fc4a5 h: refs/heads/master i: 232721: 0e59279 232719: ef56c15 v: v3
git-mirror · Feb 3, 2011 · 28c5f0c · 28c5f0c
1 parent 9d79d0e
commit 28c5f0c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 552b372ba9db85751e7db2998f07cca2e51f5865
+refs/heads/master: 57fc4a5ee322cde96c33f101d3c2d3b79011c05c
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
@@ -1419,6 +1419,7 @@ int soft_offline_page(struct page *page, int flags)
 		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 --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
@@ -772,6 +772,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
 unlock:
 	unlock_page(page);
 
+move_newpage:
 	if (rc != -EAGAIN) {
  		/*
  		 * A page that has been migrated has all references
@@ -785,8 +786,6 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
 		putback_lru_page(page);
 	}
 
-move_newpage:
-
 	/*
 	 * Move the new page to the LRU. If migration was not successful
 	 * then this will free the page.