diff options
| author | Li Zefan <lizefan@huawei.com> | 2014-03-18 10:02:36 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-03-18 22:15:36 +0100 |
| commit | 3eb59ec64fc7a3f4576da23f811b39331b830ba2 (patch) | |
| tree | 600d9c6c0b0d75017cc373a6262bc27d4836ce8d /kernel | |
| parent | cpuset: fix a race condition in __cpuset_node_allowed_softwall() (diff) | |
| download | linux-3eb59ec64fc7a3f4576da23f811b39331b830ba2.tar.xz linux-3eb59ec64fc7a3f4576da23f811b39331b830ba2.zip | |
cgroup: fix a failure path in create_css()
If online_css() fails, we should remove cgroup files belonging
to css->ss.
Signed-off-by: Li Zefan <lizefan@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 105f273b6f86..0c753ddd223b 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -4112,17 +4112,17 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss) err = percpu_ref_init(&css->refcnt, css_release); if (err) - goto err_free; + goto err_free_css; init_css(css, ss, cgrp); err = cgroup_populate_dir(cgrp, 1 << ss->subsys_id); if (err) - goto err_free; + goto err_free_percpu_ref; err = online_css(css); if (err) - goto err_free; + goto err_clear_dir; dget(cgrp->dentry); css_get(css->parent); @@ -4138,8 +4138,11 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss) return 0; -err_free: +err_clear_dir: + cgroup_clear_dir(css->cgroup, 1 << css->ss->subsys_id); +err_free_percpu_ref: percpu_ref_cancel_init(&css->refcnt); +err_free_css: ss->css_free(css); return err; } |