Commit aaad153e authored by Wanpeng Li's avatar Wanpeng Li Committed by Linus Torvalds

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

Signed-off-by: default avatarWanpeng Li <liwp.linux@gmail.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 05a73ed2
...@@ -3416,7 +3416,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg, ...@@ -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 * Rather than hide all in some function, I do this in
* open coded manner. You see what this really does. * 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); mutex_lock(&set_limit_mutex);
memswlimit = res_counter_read_u64(&memcg->memsw, RES_LIMIT); memswlimit = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
...@@ -3477,7 +3477,7 @@ static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg, ...@@ -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 * Rather than hide all in some function, I do this in
* open coded manner. You see what this really does. * 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); mutex_lock(&set_limit_mutex);
memlimit = res_counter_read_u64(&memcg->res, RES_LIMIT); memlimit = res_counter_read_u64(&memcg->res, RES_LIMIT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment