Commit 3d37c4a9 authored Jan 25, 2011 by KAMEZAWA Hiroyuki Committed by Linus Torvalds Jan 26, 2011

memcg: bugfix check mem_cgroup_disabled() at split fixup



mem_cgroup_disabled() should be checked at splitting.  If disabled, no
heavy work is necesary.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <balbir@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 01c88e2d

mm/memcontrol.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2145,6 +2145,8 @@ void mem_cgroup_split_huge_fixup(struct page head, struct page tail)
	struct page_cgroup *tail_pc = lookup_page_cgroup(tail);		struct page_cgroup *tail_pc = lookup_page_cgroup(tail);
	unsigned long flags;		unsigned long flags;

			if (mem_cgroup_disabled())
			return;
	/*		/*
	* We have no races with charge/uncharge but will have races with		* We have no races with charge/uncharge but will have races with
	* page state accounting.		* page state accounting.