PM / Hibernate: Thaw kernel threads in hibernation_snapshot() in error/test path

In the hibernation call path, the kernel threads are frozen inside
hibernation_snapshot(). If we happen to encounter an error further down
the road or if we are exiting early due to a successful freezer test,
then thaw kernel threads before returning to the caller.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

1 files changed, 2 insertions, 6 deletions

diff --git a/kernel/power/user.c b/kernel/power/user.c
index 3e100075b13c..7bee91f9af51 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -249,16 +249,12 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 }
                 pm_restore_gfp_mask();
                 error = hibernation_snapshot(data->platform_support);
-                if (error) {
-                        thaw_kernel_threads();
-                } else {
+                if (!error) {
                         error = put_user(in_suspend, (int __user *)arg);
                         if (!error && !freezer_test_done)
                                 data->ready = 1;
-                        if (freezer_test_done) {
+                        if (freezer_test_done)
                                 freezer_test_done = false;
-                                thaw_kernel_threads();
-                        }
                 }
                 break;