Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm: postpone migrated page mapping reset

Browse Source 
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:
Konstantin Khlebnikov 2012-02-03 15:37:13 -08:00 committed by Linus Torvalds
parent a1b58c237b
commit 35512ecaef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/migrate.c
View File

@ -445,7 +445,6 @@ void migrate_page_copy(struct page *newpage, struct page *page)
ClearPageSwapCache(page); ClearPageSwapCache(page);
ClearPagePrivate(page); ClearPagePrivate(page);
set_page_private(page, 0); set_page_private(page, 0);
page->mapping = NULL;
/* /*
* If any waiters have accumulated on the new page then * 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 { } else {
if (remap_swapcache) if (remap_swapcache)
remove_migration_ptes(page, newpage); remove_migration_ptes(page, newpage);
page->mapping = NULL;
} }
unlock_page(newpage); unlock_page(newpage);