diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 11:44:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 11:44:18 -0800 |
| commit | a4a4923919f2d43583789b1f3603f4e5600d8321 (patch) | |
| tree | b401e5b82050d33fc345d815d8b28ff83301534c | |
| parent | 7f3a54b8177f2e663adef2ec4b5e6ccf874f896e (diff) | |
| parent | e0197aae59e55c06db172bfbe1a1cdb8c0e1cab3 (diff) | |
| download | linux-3.10-a4a4923919f2d43583789b1f3603f4e5600d8321.tar.gz linux-3.10-a4a4923919f2d43583789b1f3603f4e5600d8321.tar.bz2 linux-3.10-a4a4923919f2d43583789b1f3603f4e5600d8321.zip | |
Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
* 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroups: fix a css_set not found bug in cgroup_attach_proc
| -rw-r--r-- | kernel/cgroup.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index d9d5648f3cd..a184470cf9b 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2098,11 +2098,6 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader) continue; /* get old css_set pointer */ task_lock(tsk); - if (tsk->flags & PF_EXITING) { - /* ignore this task if it's going away */ - task_unlock(tsk); - continue; - } oldcg = tsk->cgroups; get_css_set(oldcg); task_unlock(tsk); |