aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/cgroup_freezer.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-11-21 15:32:23 -0500
committerTejun Heo <tj@kernel.org>2011-11-21 15:32:23 -0500
commita5be2d0d1a8746e7be5210e3d6b904455000443c (patch)
tree1dcfa2725057a73059a3f768f5f5f7825b5d56ef /kernel/cgroup_freezer.c
parent8a32c441c1609f80e55df75422324a1151208f40 (diff)
freezer: rename thaw_process() to __thaw_task() and simplify the implementation
thaw_process() now has only internal users - system and cgroup freezers. Remove the unnecessary return value, rename, unexport and collapse __thaw_process() into it. This will help further updates to the freezer code. -v3: oom_kill grew a use of thaw_process() while this patch was pending. Convert it to use __thaw_task() for now. In the longer term, this should be handled by allowing tasks to die if killed even if it's frozen. -v2: minor style update as suggested by Matt. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Paul Menage <menage@google.com> Cc: Matt Helsley <matthltc@us.ibm.com>
Diffstat (limited to 'kernel/cgroup_freezer.c')
-rw-r--r--kernel/cgroup_freezer.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c
index 5e828a2ca8e6..a6d405a86ee0 100644
--- a/kernel/cgroup_freezer.c
+++ b/kernel/cgroup_freezer.c
@@ -130,7 +130,7 @@ struct cgroup_subsys freezer_subsys;
130 * write_lock css_set_lock (cgroup iterator start) 130 * write_lock css_set_lock (cgroup iterator start)
131 * task->alloc_lock 131 * task->alloc_lock
132 * read_lock css_set_lock (cgroup iterator start) 132 * read_lock css_set_lock (cgroup iterator start)
133 * task->alloc_lock (inside thaw_process(), prevents race with refrigerator()) 133 * task->alloc_lock (inside __thaw_task(), prevents race with refrigerator())
134 * sighand->siglock 134 * sighand->siglock
135 */ 135 */
136static struct cgroup_subsys_state *freezer_create(struct cgroup_subsys *ss, 136static struct cgroup_subsys_state *freezer_create(struct cgroup_subsys *ss,
@@ -300,9 +300,8 @@ static void unfreeze_cgroup(struct cgroup *cgroup, struct freezer *freezer)
300 struct task_struct *task; 300 struct task_struct *task;
301 301
302 cgroup_iter_start(cgroup, &it); 302 cgroup_iter_start(cgroup, &it);
303 while ((task = cgroup_iter_next(cgroup, &it))) { 303 while ((task = cgroup_iter_next(cgroup, &it)))
304 thaw_process(task); 304 __thaw_task(task);
305 }
306 cgroup_iter_end(cgroup, &it); 305 cgroup_iter_end(cgroup, &it);
307 306
308 freezer->state = CGROUP_THAWED; 307 freezer->state = CGROUP_THAWED;