From c3ee826c4cb99b52a9a3ac96b0540f8c2b40b633 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Mon, 21 Sep 2009 17:01:19 -0700 Subject: [PATCH] --- yaml --- r: 164371 b: refs/heads/master c: abfc3488118d48a2b8cce5a2345901aac6b03fee h: refs/heads/master i: 164369: 68821c841d299aa6a1b7ad62bd8b624232b7d122 164367: 9a3da1d4125db5920342a7f40ae1c9cd819396ea v: v3 --- [refs] | 2 +- trunk/mm/migrate.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9c5e2426731c..07301fa864ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f52407ce2deac76c87abc8211a63ea152ba72d54 +refs/heads/master: abfc3488118d48a2b8cce5a2345901aac6b03fee diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index 939888f9ddab..0edeac91348d 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -147,7 +147,7 @@ static void remove_migration_pte(struct vm_area_struct *vma, static void remove_file_migration_ptes(struct page *old, struct page *new) { struct vm_area_struct *vma; - struct address_space *mapping = page_mapping(new); + struct address_space *mapping = new->mapping; struct prio_tree_iter iter; pgoff_t pgoff = new->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); @@ -664,13 +664,15 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, * needs to be effective. */ try_to_free_buffers(page); + goto rcu_unlock; } - goto rcu_unlock; + goto skip_unmap; } /* Establish migration ptes or remove ptes */ try_to_unmap(page, 1); +skip_unmap: if (!page_mapped(page)) rc = move_to_new_page(newpage, page);