Ouch, I have totally missed this one. Acked-by: Michal Hocko <mhocko@xxxxxxx> On Mon 11-02-13 12:04:49, Glauber Costa wrote: > Signed-off-by: Glauber Costa <glommer@xxxxxxxxxxxxx> > Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> > --- > 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; > -- > 1.8.1.2 > > -- > To unsubscribe from this list: send the line "unsubscribe cgroups" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>