---

yaml --- r: 232724 b: refs/heads/master c: 48db54e h: refs/heads/master v: v3
git-mirror · Feb 3, 2011 · f05ee46 · f05ee46
1 parent 28c5f0c
commit f05ee46
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57fc4a5ee322cde96c33f101d3c2d3b79011c05c
+refs/heads/master: 48db54ee2f41e8ae2faf330b55db34a9fffb5b3c
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
@@ -1295,7 +1295,10 @@ static int soft_offline_huge_page(struct page *page, int flags)
 	ret = migrate_huge_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0,
 				true);
 	if (ret) {
-		putback_lru_pages(&pagelist);
+		struct page *page1, *page2;
+		list_for_each_entry_safe(page1, page2, &pagelist, lru)
+			put_page(page1);
+
 		pr_debug("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
@@ -980,10 +980,6 @@ int migrate_huge_pages(struct list_head *from,
 	}
 	rc = 0;
 out:
-
-	list_for_each_entry_safe(page, page2, from, lru)
-		put_page(page);
-
 	if (rc)
 		return rc;
-Original file line number
+Diff line change
@@ Expand Up / @@ -980,10 +980,6 @@ int migrate_huge_pages(struct list_head *from, @@
     	}
     	rc = 0;
     out:
-    	list_for_each_entry_safe(page, page2, from, lru)
-    		put_page(page);
     	if (rc)
     		return rc;
@@ Expand Down @@