aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2010-08-05 18:59:14 -0400
committerMichael S. Tsirkin <mst@redhat.com>2010-09-05 10:01:37 -0400
commit73457f0f836956747e0394320be2163c050e96ef (patch)
treeec0b11057cce5d93800876f4a89a2bcdbc91b69e /kernel
parent0b5d404e349c0236b11466c0a4785520c0be6982 (diff)
cgroups: fix API thinko
cgroup_attach_task_current_cg API that have upstream is backwards: we really need an API to attach to the cgroups from another process A to the current one. In our case (vhost), a priveledged user wants to attach it's task to cgroups from a less priveledged one, the API makes us run it in the other task's context, and this fails. So let's make the API generic and just pass in 'from' and 'to' tasks. Add an inline wrapper for cgroup_attach_task_current_cg to avoid breaking bisect. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Paul Menage <menage@google.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index a8ce09954404..9d90c08f3bde 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1789,10 +1789,11 @@ out:
1789} 1789}
1790 1790
1791/** 1791/**
1792 * cgroup_attach_task_current_cg - attach task 'tsk' to current task's cgroup 1792 * cgroup_attach_task_all - attach task 'tsk' to all cgroups of task 'from'
1793 * @from: attach to all cgroups of a given task
1793 * @tsk: the task to be attached 1794 * @tsk: the task to be attached
1794 */ 1795 */
1795int cgroup_attach_task_current_cg(struct task_struct *tsk) 1796int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk)
1796{ 1797{
1797 struct cgroupfs_root *root; 1798 struct cgroupfs_root *root;
1798 struct cgroup *cur_cg; 1799 struct cgroup *cur_cg;
@@ -1800,7 +1801,7 @@ int cgroup_attach_task_current_cg(struct task_struct *tsk)
1800 1801
1801 cgroup_lock(); 1802 cgroup_lock();
1802 for_each_active_root(root) { 1803 for_each_active_root(root) {
1803 cur_cg = task_cgroup_from_root(current, root); 1804 cur_cg = task_cgroup_from_root(from, root);
1804 retval = cgroup_attach_task(cur_cg, tsk); 1805 retval = cgroup_attach_task(cur_cg, tsk);
1805 if (retval) 1806 if (retval)
1806 break; 1807 break;
@@ -1809,7 +1810,7 @@ int cgroup_attach_task_current_cg(struct task_struct *tsk)
1809 1810
1810 return retval; 1811 return retval;
1811} 1812}
1812EXPORT_SYMBOL_GPL(cgroup_attach_task_current_cg); 1813EXPORT_SYMBOL_GPL(cgroup_attach_task_all);
1813 1814
1814/* 1815/*
1815 * Attach task with pid 'pid' to cgroup 'cgrp'. Call with cgroup_mutex 1816 * Attach task with pid 'pid' to cgroup 'cgrp'. Call with cgroup_mutex