diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 04:59:51 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 04:59:51 (GMT) |
| commit | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (patch) | |
| tree | e5dd90cca3a69bc993b5aa860a9eeb8c9178450a /kernel/cgroup.c | |
| parent | c9cedbba0fc591e1c0587f838932ca3f3c6fec57 (diff) | |
| parent | 615cc2211c17ed05a2a5d94abdac6c340a8ea508 (diff) | |
| download | linux-053d8f6622701f849fda2ca2c9ae596c13599ba9.tar.xz | |
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 192f88c..ed19afd 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1791,10 +1791,11 @@ out: } /** - * cgroup_attach_task_current_cg - attach task 'tsk' to current task's cgroup + * cgroup_attach_task_all - attach task 'tsk' to all cgroups of task 'from' + * @from: attach to all cgroups of a given task * @tsk: the task to be attached */ -int cgroup_attach_task_current_cg(struct task_struct *tsk) +int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) { struct cgroupfs_root *root; struct cgroup *cur_cg; @@ -1802,7 +1803,7 @@ int cgroup_attach_task_current_cg(struct task_struct *tsk) cgroup_lock(); for_each_active_root(root) { - cur_cg = task_cgroup_from_root(current, root); + cur_cg = task_cgroup_from_root(from, root); retval = cgroup_attach_task(cur_cg, tsk); if (retval) break; @@ -1811,7 +1812,7 @@ int cgroup_attach_task_current_cg(struct task_struct *tsk) return retval; } -EXPORT_SYMBOL_GPL(cgroup_attach_task_current_cg); +EXPORT_SYMBOL_GPL(cgroup_attach_task_all); /* * Attach task with pid 'pid' to cgroup 'cgrp'. Call with cgroup_mutex |