diff options
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index c500ca7239b2..27792bcb0758 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -3084,18 +3084,19 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys, | |||
3084 | } | 3084 | } |
3085 | 3085 | ||
3086 | /** | 3086 | /** |
3087 | * cgroup_is_descendant - see if @cgrp is a descendant of current task's cgrp | 3087 | * cgroup_is_descendant - see if @cgrp is a descendant of @task's cgrp |
3088 | * @cgrp: the cgroup in question | 3088 | * @cgrp: the cgroup in question |
3089 | * @task: the task in question | ||
3089 | * | 3090 | * |
3090 | * See if @cgrp is a descendant of the current task's cgroup in | 3091 | * See if @cgrp is a descendant of @task's cgroup in the appropriate |
3091 | * the appropriate hierarchy. | 3092 | * hierarchy. |
3092 | * | 3093 | * |
3093 | * If we are sending in dummytop, then presumably we are creating | 3094 | * If we are sending in dummytop, then presumably we are creating |
3094 | * the top cgroup in the subsystem. | 3095 | * the top cgroup in the subsystem. |
3095 | * | 3096 | * |
3096 | * Called only by the ns (nsproxy) cgroup. | 3097 | * Called only by the ns (nsproxy) cgroup. |
3097 | */ | 3098 | */ |
3098 | int cgroup_is_descendant(const struct cgroup *cgrp) | 3099 | int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task) |
3099 | { | 3100 | { |
3100 | int ret; | 3101 | int ret; |
3101 | struct cgroup *target; | 3102 | struct cgroup *target; |
@@ -3105,7 +3106,7 @@ int cgroup_is_descendant(const struct cgroup *cgrp) | |||
3105 | return 1; | 3106 | return 1; |
3106 | 3107 | ||
3107 | get_first_subsys(cgrp, NULL, &subsys_id); | 3108 | get_first_subsys(cgrp, NULL, &subsys_id); |
3108 | target = task_cgroup(current, subsys_id); | 3109 | target = task_cgroup(task, subsys_id); |
3109 | while (cgrp != target && cgrp!= cgrp->top_cgroup) | 3110 | while (cgrp != target && cgrp!= cgrp->top_cgroup) |
3110 | cgrp = cgrp->parent; | 3111 | cgrp = cgrp->parent; |
3111 | ret = (cgrp == target); | 3112 | ret = (cgrp == target); |