---

yaml --- r: 282995 b: refs/heads/master c: 937a94c h: refs/heads/master i: 282993: 79c3ba4 282991: 63956d6 v: v3
git-mirror · Jan 11, 2012 · 2ea35dd · 2ea35dd
1 parent 951d458
commit 2ea35dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90a5d5af74f6570af063fb6bff33c6b2f8361bbc
+refs/heads/master: 937a94c9db30a818baa5e2c09dbf4589251355c3
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
@@ -269,12 +269,12 @@ static int migrate_page_move_mapping(struct address_space *mapping,
 
 	radix_tree_replace_slot(pslot, newpage);
 
-	page_unfreeze_refs(page, expected_count);
 	/*
-	 * Drop cache reference from old page.
+	 * Drop cache reference from old page by unfreezing
+	 * to one less reference.
 	 * We know this isn't the last reference.
 	 */
-	__put_page(page);
+	page_unfreeze_refs(page, expected_count - 1);
 
 	/*
 	 * If moved to a different zone then also account
@@ -334,9 +334,7 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,
 
 	radix_tree_replace_slot(pslot, newpage);
 
-	page_unfreeze_refs(page, expected_count);
-
-	__put_page(page);
+	page_unfreeze_refs(page, expected_count - 1);
 
 	spin_unlock_irq(&mapping->tree_lock);
 	return 0;