summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLi Zhong <zhong@linux.vnet.ibm.com>2012-11-28 10:15:21 +0100
committerTejun Heo <tj@kernel.org>2012-11-28 15:02:39 +0100
commitfddfb02ad0d0d3b479c2a26a8ae7e6411b34706b (patch)
treef3d8aa9e526486f4d07fc6f0a3619ce98ffeb3b9 /kernel
parentnetprio_cgroup: allow nesting and inherit config on cgroup creation (diff)
downloadlinux-fddfb02ad0d0d3b479c2a26a8ae7e6411b34706b.tar.xz
linux-fddfb02ad0d0d3b479c2a26a8ae7e6411b34706b.zip
cgroup: move list add after list head initilization
2243076ad1 ("cgroup: initialize cgrp->allcg_node in init_cgroup_housekeeping()") initializes cgrp->allcg_node in init_cgroup_housekeeping(). Then in init_cgroup_root(), we should call init_cgroup_housekeeping() before adding it to &root->allcg_list; otherwise, we are initializing an entry already in a list. Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 55a0a770a5a2..c02b05560d10 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1401,8 +1401,8 @@ static void init_cgroup_root(struct cgroupfs_root *root)
root->number_of_cgroups = 1;
cgrp->root = root;
cgrp->top_cgroup = cgrp;
- list_add_tail(&cgrp->allcg_node, &root->allcg_list);
init_cgroup_housekeeping(cgrp);
+ list_add_tail(&cgrp->allcg_node, &root->allcg_list);
}
static bool init_root_id(struct cgroupfs_root *root)