Commit 3bb4edf2 authored Jan 07, 2009 by Daisuke Nishimura Committed by Linus Torvalds Jan 08, 2009

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>

parent 9836d891

mm/memcontrol.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1361,7 +1361,7 @@ int mem_cgroup_prepare_migration(struct page page, struct mem_cgroup *ptr)
	unlock_page_cgroup(pc);		unlock_page_cgroup(pc);

	if (mem) {		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);		css_put(&mem->css);
	}		}
	*ptr = mem;		*ptr = mem;