diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 13:55:59 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 13:55:59 -0800 |
commit | a34815b96f9a21b3a2e2912dfd0d994acd2855e3 (patch) | |
tree | e2e6ac428637059305d7c00274f0c034f0c82858 /kernel | |
parent | 9b5a4d4f65e260a109eaeea8bbc8062a7c58b55e (diff) | |
parent | 884a45d964dd395eda945842afff5e16bcaedf56 (diff) | |
download | lwn-a34815b96f9a21b3a2e2912dfd0d994acd2855e3.tar.gz lwn-a34815b96f9a21b3a2e2912dfd0d994acd2855e3.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:
cgroup_freezer: fix freezing groups with stopped tasks
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cgroup_freezer.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c index 5e828a2ca8e6..213c0351dad8 100644 --- a/kernel/cgroup_freezer.c +++ b/kernel/cgroup_freezer.c @@ -153,6 +153,13 @@ static void freezer_destroy(struct cgroup_subsys *ss, kfree(cgroup_freezer(cgroup)); } +/* task is frozen or will freeze immediately when next it gets woken */ +static bool is_task_frozen_enough(struct task_struct *task) +{ + return frozen(task) || + (task_is_stopped_or_traced(task) && freezing(task)); +} + /* * The call to cgroup_lock() in the freezer.state write method prevents * a write to that file racing against an attach, and hence the @@ -231,7 +238,7 @@ static void update_if_frozen(struct cgroup *cgroup, cgroup_iter_start(cgroup, &it); while ((task = cgroup_iter_next(cgroup, &it))) { ntotal++; - if (frozen(task)) + if (is_task_frozen_enough(task)) nfrozen++; } @@ -284,7 +291,7 @@ static int try_to_freeze_cgroup(struct cgroup *cgroup, struct freezer *freezer) while ((task = cgroup_iter_next(cgroup, &it))) { if (!freeze_task(task, true)) continue; - if (frozen(task)) + if (is_task_frozen_enough(task)) continue; if (!freezing(task) && !freezer_should_skip(task)) num_cant_freeze_now++; |