mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
mm: migrate: consolidate mem_cgroup_migrate() calls
Rather than scattering mem_cgroup_migrate() calls all over the place, have a single call from a safe place where every migration operation eventually ends up in - migrate_page_copy(). Signed-off-by: Johannes Weiner <[email protected]> Suggested-by: Hugh Dickins <[email protected]> Acked-by: Vladimir Davydov <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: Mateusz Guzik <[email protected]> Cc: Sergey Senozhatsky <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
7cf91a98e6
commit
74485cf2bc
1 changed files with 2 additions and 7 deletions
|
|
@ -331,8 +331,6 @@ int migrate_page_move_mapping(struct address_space *mapping,
|
|||
if (PageSwapBacked(page))
|
||||
SetPageSwapBacked(newpage);
|
||||
|
||||
mem_cgroup_migrate(page, newpage);
|
||||
|
||||
return MIGRATEPAGE_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -428,8 +426,6 @@ int migrate_page_move_mapping(struct address_space *mapping,
|
|||
}
|
||||
local_irq_enable();
|
||||
|
||||
mem_cgroup_migrate(page, newpage);
|
||||
|
||||
return MIGRATEPAGE_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -471,8 +467,6 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,
|
|||
|
||||
spin_unlock_irq(&mapping->tree_lock);
|
||||
|
||||
mem_cgroup_migrate(page, newpage);
|
||||
|
||||
return MIGRATEPAGE_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -586,6 +580,8 @@ void migrate_page_copy(struct page *newpage, struct page *page)
|
|||
end_page_writeback(newpage);
|
||||
|
||||
copy_page_owner(page, newpage);
|
||||
|
||||
mem_cgroup_migrate(page, newpage);
|
||||
}
|
||||
|
||||
/************************************************************
|
||||
|
|
@ -1846,7 +1842,6 @@ fail_putback:
|
|||
}
|
||||
|
||||
mlock_migrate_page(new_page, page);
|
||||
mem_cgroup_migrate(page, new_page);
|
||||
page_remove_rmap(page, true);
|
||||
set_page_owner_migrate_reason(new_page, MR_NUMA_MISPLACED);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue