diff --git a/[refs] b/[refs] index 42f6de612d5e..753a052d5dd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e9e3cbc62da43c66e894d5a61fa08b427e25202 +refs/heads/master: baef99a08a2e23d9386b47e53fa5f0d44fc98f66 diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index c29831076e7a..2ae7cb47dbfa 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -2434,7 +2434,9 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry, err_remove: + cgroup_lock_hierarchy(root); list_del(&cgrp->sibling); + cgroup_unlock_hierarchy(root); root->number_of_cgroups--; err_destroy: