summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2017-01-26 16:47:42 -0500
committerTejun Heo <tj@kernel.org>2017-01-26 16:47:42 -0500
commitbdf3d06bedebd31539b68b4a744054f994ecc2e1 (patch)
tree2af0e188d45b68f54505dcea73f8396e7db90270
parentbfc2cf6f61fceac42235345081eb713329baa2a2 (diff)
parent07cd12945551b63ecb1a349d50a6d69d1d6feb4a (diff)
Merge branch 'for-4.10-fixes' into for-4.11
-rw-r--r--kernel/cgroup/cgroup.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 69ad5b3de0c1..0dcc4c7e935e 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4071,6 +4071,11 @@ err_free_css:
return ERR_PTR(err);
}
+/*
+ * The returned cgroup is fully initialized including its control mask, but
+ * it isn't associated with its kernfs_node and doesn't have the control
+ * mask applied.
+ */
static struct cgroup *cgroup_create(struct cgroup *parent)
{
struct cgroup_root *root = parent->root;
@@ -4138,11 +4143,6 @@ static struct cgroup *cgroup_create(struct cgroup *parent)
cgroup_propagate_control(cgrp);
- /* @cgrp doesn't have dir yet so the following will only create csses */
- ret = cgroup_apply_control_enable(cgrp);
- if (ret)
- goto out_destroy;
-
return cgrp;
out_cancel_ref:
@@ -4150,9 +4150,6 @@ out_cancel_ref:
out_free_cgrp:
kfree(cgrp);
return ERR_PTR(ret);
-out_destroy:
- cgroup_destroy_locked(cgrp);
- return ERR_PTR(ret);
}
int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name, umode_t mode)