From 2ea35dd15983bbfedfd7bbb01ef837d04635d17f Mon Sep 17 00:00:00 2001 From: Jacobo Giralt Date: Tue, 10 Jan 2012 15:07:11 -0800 Subject: [PATCH] --- yaml --- r: 282995 b: refs/heads/master c: 937a94c9db30a818baa5e2c09dbf4589251355c3 h: refs/heads/master i: 282993: 79c3ba4b3f9e82a027bb4c2eb4453b26572cf360 282991: 63956d68a9858ec226fc9b25da400ed2d3f52fc6 v: v3 --- [refs] | 2 +- trunk/mm/migrate.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 59e5f2175371..c7db3a791c31 100644 --- 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 index 177aca424a06..594dc375d0f9 100644 --- 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;