aboutsummaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/linux/cgroup.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index ed3e92e41c6e..5a53d8f039a2 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -578,7 +578,11 @@ struct task_struct *cgroup_iter_next(struct cgroup *cgrp,
578void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it); 578void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it);
579int cgroup_scan_tasks(struct cgroup_scanner *scan); 579int cgroup_scan_tasks(struct cgroup_scanner *scan);
580int cgroup_attach_task(struct cgroup *, struct task_struct *); 580int cgroup_attach_task(struct cgroup *, struct task_struct *);
581int cgroup_attach_task_current_cg(struct task_struct *); 581int cgroup_attach_task_all(struct task_struct *from, struct task_struct *);
582static inline int cgroup_attach_task_current_cg(struct task_struct *tsk)
583{
584 return cgroup_attach_task_all(current, tsk);
585}
582 586
583/* 587/*
584 * CSS ID is ID for cgroup_subsys_state structs under subsys. This only works 588 * CSS ID is ID for cgroup_subsys_state structs under subsys. This only works
@@ -636,6 +640,11 @@ static inline int cgroupstats_build(struct cgroupstats *stats,
636} 640}
637 641
638/* No cgroups - nothing to do */ 642/* No cgroups - nothing to do */
643static inline int cgroup_attach_task_all(struct task_struct *from,
644 struct task_struct *t)
645{
646 return 0;
647}
639static inline int cgroup_attach_task_current_cg(struct task_struct *t) 648static inline int cgroup_attach_task_current_cg(struct task_struct *t)
640{ 649{
641 return 0; 650 return 0;