summaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-04-12 10:29:04 -0700
committerTejun Heo <tj@kernel.org>2013-04-12 10:29:04 -0700
commit26d5bbe5ba2073fc7ef9e69a55543b2376f5bad0 (patch)
treed4dcfdec4d3046bb3cee35864264669d44a3a3dc /kernel/cgroup.c
parentef824fa129b7579f56b92d466ecda2e378879806 (diff)
downloadop-kernel-dev-26d5bbe5ba2073fc7ef9e69a55543b2376f5bad0.zip
op-kernel-dev-26d5bbe5ba2073fc7ef9e69a55543b2376f5bad0.tar.gz
Revert "cgroup: remove bind() method from cgroup_subsys."
This reverts commit 84cfb6ab484b442d5115eb3baf9db7d74a3ea626. There are scheduled changes which make use of the removed callback. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Rami Rosen <ramirose@gmail.com> Cc: Li Zefan <lizefan@huawei.com>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 7bf3ce0..678a22c 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1091,12 +1091,16 @@ static int rebind_subsystems(struct cgroupfs_root *root,
cgrp->subsys[i]->cgroup = cgrp;
list_move(&ss->sibling, &root->subsys_list);
ss->root = root;
+ if (ss->bind)
+ ss->bind(cgrp);
/* refcount was already taken, and we're keeping it */
} else if (bit & removed_mask) {
/* We're removing this subsystem */
BUG_ON(ss == NULL);
BUG_ON(cgrp->subsys[i] != dummytop->subsys[i]);
BUG_ON(cgrp->subsys[i]->cgroup != cgrp);
+ if (ss->bind)
+ ss->bind(dummytop);
dummytop->subsys[i]->cgroup = dummytop;
cgrp->subsys[i] = NULL;
subsys[i]->root = &rootnode;
OpenPOWER on IntegriCloud