---

yaml --- r: 190680 b: refs/heads/master c: fae9c79 h: refs/heads/master v: v3
git-mirror · May 4, 2010 · aa965db · aa965db
1 parent 3d3ecd4
commit aa965db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a9686b634acc5cb6b7c601c171ae64af0318a24
+refs/heads/master: fae9c791703606636c1220e47f6690660042ce7f
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -4561,13 +4561,13 @@ static int alloc_css_id(struct cgroup_subsys *ss, struct cgroup *parent,
 {
 	int subsys_id, i, depth = 0;
 	struct cgroup_subsys_state *parent_css, *child_css;
-	struct css_id *child_id, *parent_id = NULL;
+	struct css_id *child_id, *parent_id;
 
 	subsys_id = ss->subsys_id;
 	parent_css = parent->subsys[subsys_id];
 	child_css = child->subsys[subsys_id];
-	depth = css_depth(parent_css) + 1;
 	parent_id = parent_css->id;
+	depth = parent_id->depth;
 
 	child_id = get_new_cssid(ss, depth);
 	if (IS_ERR(child_id))