forked from luck/tmp_suning_uos_patched
mm: postpone migrated page mapping reset
Postpone resetting page->mapping until the final remove_migration_ptes(). Otherwise the expression PageAnon(migration_entry_to_page(entry)) does not work. Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> Cc: Hugh Dickins <hughd@google.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a1b58c237b
commit
35512ecaef
|
@ -445,7 +445,6 @@ void migrate_page_copy(struct page *newpage, struct page *page)
|
|||
ClearPageSwapCache(page);
|
||||
ClearPagePrivate(page);
|
||||
set_page_private(page, 0);
|
||||
page->mapping = NULL;
|
||||
|
||||
/*
|
||||
* If any waiters have accumulated on the new page then
|
||||
|
@ -667,6 +666,7 @@ static int move_to_new_page(struct page *newpage, struct page *page,
|
|||
} else {
|
||||
if (remap_swapcache)
|
||||
remove_migration_ptes(page, newpage);
|
||||
page->mapping = NULL;
|
||||
}
|
||||
|
||||
unlock_page(newpage);
|
||||
|
|
Loading…
Reference in New Issue
Block a user