From a14c55048c3375127c398a63b6d42089be7a82bd Mon Sep 17 00:00:00 2001 From: Greg Thelen Date: Fri, 4 Jun 2010 14:15:03 -0700 Subject: [PATCH] --- yaml --- r: 199822 b: refs/heads/master c: 94b3dd0f7bb393d93e84a173b1df9b8b64c83ac4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/cgroup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 813e438d924d..c9557e0b2576 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 007d08678eb87478b65b3f229960c81dd7c7b8f3 +refs/heads/master: 94b3dd0f7bb393d93e84a173b1df9b8b64c83ac4 diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index 422cb19f156e..3ac6f5b0a64b 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -4598,7 +4598,7 @@ static int alloc_css_id(struct cgroup_subsys *ss, struct cgroup *parent, parent_css = parent->subsys[subsys_id]; child_css = child->subsys[subsys_id]; parent_id = parent_css->id; - depth = parent_id->depth; + depth = parent_id->depth + 1; child_id = get_new_cssid(ss, depth); if (IS_ERR(child_id))