PM / Hibernate: Enable usermodehelpers in hibernate() error path

commit 05b4877f6a4f1ba4952d1222213d262bf8c132b7 upstream.

If create_basic_memory_bitmaps() fails, usermodehelpers are not re-enabled
before returning. Fix this. And while at it, reword the goto labels so that
they look more meaningful.

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

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 8f7b1db1ece1b3273f9eebbc128d7c884390c638..8884c27682f5c020db704d1ecd287b8854abf3d7 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -623,7 +623,7 @@ int hibernate(void)
        /* Allocate memory management structures */
        error = create_basic_memory_bitmaps();
        if (error)
-               goto Exit;
+               goto Enable_umh;
 
        printk(KERN_INFO "PM: Syncing filesystems ... ");
        sys_sync();
@@ -631,7 +631,7 @@ int hibernate(void)
 
        error = prepare_processes();
        if (error)
-               goto Finish;
+               goto Free_bitmaps;
 
        if (hibernation_test(TEST_FREEZER))
                goto Thaw;
@@ -663,8 +663,9 @@ int hibernate(void)
 
  Thaw:
        thaw_processes();
- Finish:
+ Free_bitmaps:
        free_basic_memory_bitmaps();
+ Enable_umh:
        usermodehelper_enable();
  Exit:
        pm_notifier_call_chain(PM_POST_HIBERNATION);