diff options
author | Grzegorz Nosek <root@localdomain.pl> | 2009-04-02 19:57:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-02 22:04:53 -0400 |
commit | 313e924c0852943e67335fad9d2608701f0dfe8e (patch) | |
tree | fa4c3f65a7ed6edea52ae78b012138ebab1420c3 /include/linux/cgroup.h | |
parent | d20a390a0ee2bf2f692c539c6ce1c829e1080bb5 (diff) |
cgroups: relax ns_can_attach checks to allow attaching to grandchild cgroups
The ns_proxy cgroup allows moving processes to child cgroups only one
level deep at a time. This commit relaxes this restriction and makes it
possible to attach tasks directly to grandchild cgroups, e.g.:
($pid is in the root cgroup)
echo $pid > /cgroup/CG1/CG2/tasks
Previously this operation would fail with -EPERM and would have to be
performed as two steps:
echo $pid > /cgroup/CG1/tasks
echo $pid > /cgroup/CG1/CG2/tasks
Also, the target cgroup no longer needs to be empty to move a task there.
Signed-off-by: Grzegorz Nosek <root@localdomain.pl>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/cgroup.h')
-rw-r--r-- | include/linux/cgroup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index bb8feb9feccd..788c4964c142 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
@@ -348,8 +348,8 @@ int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen); | |||
348 | 348 | ||
349 | int cgroup_task_count(const struct cgroup *cgrp); | 349 | int cgroup_task_count(const struct cgroup *cgrp); |
350 | 350 | ||
351 | /* Return true if the cgroup is a descendant of the current cgroup */ | 351 | /* Return true if cgrp is a descendant of the task's cgroup */ |
352 | int cgroup_is_descendant(const struct cgroup *cgrp); | 352 | int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task); |
353 | 353 | ||
354 | /* Control Group subsystem type. See Documentation/cgroups.txt for details */ | 354 | /* Control Group subsystem type. See Documentation/cgroups.txt for details */ |
355 | 355 | ||