memcg: don't trigger oom at page migration
I think triggering OOM at mem_cgroup_prepare_migration would be just a bit overkill. Returning -ENOMEM would be enough for mem_cgroup_prepare_migration. The caller would handle the case anyway. Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Balbir Singh <balbir@linux.vnet.ibm.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
9836d89191
commit
3bb4edf24b
@ -1361,7 +1361,7 @@ int mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr)
|
||||
unlock_page_cgroup(pc);
|
||||
|
||||
if (mem) {
|
||||
ret = mem_cgroup_try_charge(NULL, GFP_KERNEL, &mem);
|
||||
ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, &mem, false);
|
||||
css_put(&mem->css);
|
||||
}
|
||||
*ptr = mem;
|
||||
|
Loading…
Reference in New Issue
Block a user