Re: [PATCH 2/2] memcg: replace cgroup_lock with memcg specific memcg_lock fix
From: Kamezawa Hiroyuki <hidden>
Date: 2013-02-13 10:43:46
Also in:
linux-mm
(2013/02/11 17:04), Glauber Costa wrote:
Signed-off-by: Glauber Costa <redacted> Reported-by: Dan Carpenter <redacted>
I'm sorry I missed this... Acked-by: KAMEZAWA Hiroyuki <redacted>
quoted hunk ↗ jump to hunk
--- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 28252c9..03ebf68 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c@@ -5884,7 +5884,7 @@ static int mem_cgroup_oom_control_write(struct cgroup *cgrp, mutex_lock(&memcg_create_mutex); /* oom-kill-disable is a flag for subhierarchy. */ if ((parent->use_hierarchy) || memcg_has_children(memcg)) { - cgroup_unlock(); + mutex_unlock(&memcg_create_mutex); return -EINVAL; } memcg->oom_kill_disable = val;