cgroup: Fix cgroup_subsys::exit callback
Make the ::exit method act like ::attach, it is after all very nearly the same thing. The bug had no effect on correctness - fixing it is an optimization for the scheduler. Also, later perf-cgroups patches rely on it. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Paul Menage <menage@google.com> LKML-Reference: <1297160655.13327.92.camel@laptop> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:

committed by
Ingo Molnar

parent
b00560f2d4
commit
d41d5a0163
@@ -4230,20 +4230,8 @@ void cgroup_post_fork(struct task_struct *child)
|
||||
*/
|
||||
void cgroup_exit(struct task_struct *tsk, int run_callbacks)
|
||||
{
|
||||
int i;
|
||||
struct css_set *cg;
|
||||
|
||||
if (run_callbacks && need_forkexit_callback) {
|
||||
/*
|
||||
* modular subsystems can't use callbacks, so no need to lock
|
||||
* the subsys array
|
||||
*/
|
||||
for (i = 0; i < CGROUP_BUILTIN_SUBSYS_COUNT; i++) {
|
||||
struct cgroup_subsys *ss = subsys[i];
|
||||
if (ss->exit)
|
||||
ss->exit(ss, tsk);
|
||||
}
|
||||
}
|
||||
int i;
|
||||
|
||||
/*
|
||||
* Unlink from the css_set task list if necessary.
|
||||
@@ -4261,7 +4249,24 @@ void cgroup_exit(struct task_struct *tsk, int run_callbacks)
|
||||
task_lock(tsk);
|
||||
cg = tsk->cgroups;
|
||||
tsk->cgroups = &init_css_set;
|
||||
|
||||
if (run_callbacks && need_forkexit_callback) {
|
||||
/*
|
||||
* modular subsystems can't use callbacks, so no need to lock
|
||||
* the subsys array
|
||||
*/
|
||||
for (i = 0; i < CGROUP_BUILTIN_SUBSYS_COUNT; i++) {
|
||||
struct cgroup_subsys *ss = subsys[i];
|
||||
if (ss->exit) {
|
||||
struct cgroup *old_cgrp =
|
||||
rcu_dereference_raw(cg->subsys[i])->cgroup;
|
||||
struct cgroup *cgrp = task_cgroup(tsk, i);
|
||||
ss->exit(ss, cgrp, old_cgrp, tsk);
|
||||
}
|
||||
}
|
||||
}
|
||||
task_unlock(tsk);
|
||||
|
||||
if (cg)
|
||||
put_css_set_taskexit(cg);
|
||||
}
|
||||
|
Reference in New Issue
Block a user