From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daisuke Nishimura Subject: [PATCH -mmotm 1/4] memcg: don't trigger oom at page migration Date: Mon, 8 Dec 2008 11:02:42 +0900 Message-ID: <20081208110242.477e0837.nishimura@mxp.nes.nec.co.jp> References: <20081208105824.f8f5d67b.nishimura@mxp.nes.nec.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20081208105824.f8f5d67b.nishimura@mxp.nes.nec.co.jp> Sender: linux-kernel-owner@vger.kernel.org To: Andrew Morton Cc: LKML , linux-mm , Balbir Singh , KAMEZAWA Hiroyuki , Pavel Emelyanov , Li Zefan , Paul Menage , nishimura@mxp.nes.nec.co.jp List-Id: linux-mm.kvack.org 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 Acked-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh --- mm/memcontrol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a4854a7..0683459 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1331,7 +1331,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;