Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaad153e authored Jul 31, 2012 by Wanpeng Li Committed by Linus Torvalds Jul 31, 2012

mm/memcg: mem_cgroup_relize_xxx_limit can guarantee memcg->res.limit <= memcg->memsw.limit



Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 05a73ed2

mm/memcontrol.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3416,7 +3416,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
		/*
		* Rather than hide all in some function, I do this in
		* open coded manner. You see what this really does.
		* We have to guarantee memcg->res.limit < memcg->memsw.limit.
		* We have to guarantee memcg->res.limit <= memcg->memsw.limit.
		*/
		mutex_lock(&set_limit_mutex);
		memswlimit = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
		@@ -3477,7 +3477,7 @@ static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
		/*
		* Rather than hide all in some function, I do this in
		* open coded manner. You see what this really does.
		* We have to guarantee memcg->res.limit < memcg->memsw.limit.
		* We have to guarantee memcg->res.limit <= memcg->memsw.limit.
		*/
		mutex_lock(&set_limit_mutex);
		memlimit = res_counter_read_u64(&memcg->res, RES_LIMIT);