PM / Hibernate: Refactor and simplify freezer_test_done

The code related to 'freezer_test_done' is needlessly convoluted.
Refactor the code and simplify the implementation.

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

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index c6dee739080cb85abd3d23ead0228cc0be8d8941..72baaf011fb7ed3b9ccd54e48536debc857541e0 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -629,12 +629,8 @@ int hibernate(void)
                goto Finish;
 
        error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
-       if (error)
-               goto Thaw;
-       if (freezer_test_done) {
-               freezer_test_done = false;
+       if (error || freezer_test_done)
                goto Thaw;
-       }
 
        if (in_suspend) {
                unsigned int flags = 0;
@@ -659,6 +655,10 @@ int hibernate(void)
 
  Thaw:
        thaw_processes();
+
+       /* Don't bother checking whether freezer_test_done is true */
+       freezer_test_done = false;
+
  Finish:
        free_basic_memory_bitmaps();
        usermodehelper_enable();

diff --git a/kernel/power/user.c b/kernel/power/user.c
index 7bee91f9af51f7281f3e47915eb0ecd0350b8234..33c4329205af0e88da9e80ee98e9ff0e1259bf7d 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -251,10 +251,8 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                error = hibernation_snapshot(data->platform_support);
                if (!error) {
                        error = put_user(in_suspend, (int __user *)arg);
-                       if (!error && !freezer_test_done)
-                               data->ready = 1;
-                       if (freezer_test_done)
-                               freezer_test_done = false;
+                       data->ready = !freezer_test_done && !error;
+                       freezer_test_done = false;
                }
                break;