diff options
author | Li Zefan <lizefan@huawei.com> | 2013-03-12 15:35:58 -0700 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-03-12 15:35:58 -0700 |
commit | e7b2dcc52b0e2d598a469f01cc460ccdde6869f2 (patch) | |
tree | c716655a75a9f91de5f21f94fe53e96fbf680fe9 | |
parent | cfb5966bef85412dab9c93553db10b3e99ac32e8 (diff) | |
download | op-kernel-dev-e7b2dcc52b0e2d598a469f01cc460ccdde6869f2.zip op-kernel-dev-e7b2dcc52b0e2d598a469f01cc460ccdde6869f2.tar.gz |
cgroup: remove cgroup_is_descendant()
It was used by ns cgroup, and ns cgroup was removed long ago.
Signed-off-by: Li Zefan <lizefan@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r-- | include/linux/cgroup.h | 3 | ||||
-rw-r--r-- | kernel/cgroup.c | 28 |
2 files changed, 0 insertions, 31 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 5f76829..7e818a3 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -448,9 +448,6 @@ int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen); int cgroup_task_count(const struct cgroup *cgrp); -/* Return true if cgrp is a descendant of the task's cgroup */ -int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task); - /* * Control Group taskset, used to pass around set of tasks to cgroup_subsys * methods. diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 7a6c4c7..f51443f 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -5035,34 +5035,6 @@ void cgroup_exit(struct task_struct *tsk, int run_callbacks) put_css_set_taskexit(cg); } -/** - * cgroup_is_descendant - see if @cgrp is a descendant of @task's cgrp - * @cgrp: the cgroup in question - * @task: the task in question - * - * See if @cgrp is a descendant of @task's cgroup in the appropriate - * hierarchy. - * - * If we are sending in dummytop, then presumably we are creating - * the top cgroup in the subsystem. - * - * Called only by the ns (nsproxy) cgroup. - */ -int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task) -{ - int ret; - struct cgroup *target; - - if (cgrp == dummytop) - return 1; - - target = task_cgroup_from_root(task, cgrp->root); - while (cgrp != target && cgrp!= cgrp->top_cgroup) - cgrp = cgrp->parent; - ret = (cgrp == target); - return ret; -} - static void check_for_release(struct cgroup *cgrp) { /* All of these checks rely on RCU to keep the cgroup |