diff options
author | Tejun Heo <tj@kernel.org> | 2011-11-21 20:32:24 (GMT) |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-11-21 20:32:24 (GMT) |
commit | 03afed8bc296fa70186ba832c1126228bb992465 (patch) | |
tree | 96d0a6a9bffdcfc678d31f21caa88e43693bde94 /include | |
parent | 376fede80e74d98b49d1ba9ac18f23c9fd026ddd (diff) | |
download | linux-03afed8bc296fa70186ba832c1126228bb992465.tar.xz |
freezer: clean up freeze_processes() failure path
freeze_processes() failure path is rather messy. Freezing is canceled
for workqueues and tasks which aren't frozen yet but frozen tasks are
left alone and should be thawed by the caller and of course some
callers (xen and kexec) didn't do it.
This patch updates __thaw_task() to handle cancelation correctly and
makes freeze_processes() and freeze_kernel_threads() call
thaw_processes() on failure instead so that the system is fully thawed
on failure. Unnecessary [suspend_]thaw_processes() calls are removed
from kernel/power/hibernate.c, suspend.c and user.c.
While at it, restructure error checking if clause in suspend_prepare()
to be less weird.
-v2: Srivatsa spotted missing removal of suspend_thaw_processes() in
suspend_prepare() and error in commit message. Updated.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/freezer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/freezer.h b/include/linux/freezer.h index ba4f512..93f411a 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h @@ -61,7 +61,6 @@ static inline bool try_to_freeze(void) } extern bool freeze_task(struct task_struct *p, bool sig_only); -extern void cancel_freezing(struct task_struct *p); #ifdef CONFIG_CGROUP_FREEZER extern int cgroup_freezing_or_frozen(struct task_struct *task); |