PM / Hibernate: Disable usermode helpers right before freezing tasks

commit 7b5179ac14dbad945647ac9e76bbbf14ed9e0dbe upstream.

There is no reason to call usermodehelper_disable() before creating
memory bitmaps in hibernate() and software_resume(), so call it right
before freeze_processes(), in accordance with the other suspend and
hibernation code.  Consequently, call usermodehelper_enable() right
after the thawing of tasks rather than after freeing the memory
bitmaps.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 7bef75550068ac3b5e68809c510c2e86ce1960c9..12334ee412cab6c84e76c958937b111ed64cb1e9 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -609,19 +609,19 @@ int hibernate(void)
        if (error)
                goto Exit;
 
-       error = usermodehelper_disable();
-       if (error)
-               goto Exit;
-
        /* Allocate memory management structures */
        error = create_basic_memory_bitmaps();
        if (error)
-               goto Enable_umh;
+               goto Exit;
 
        printk(KERN_INFO "PM: Syncing filesystems ... ");
        sys_sync();
        printk("done.\n");
 
+       error = usermodehelper_disable();
+       if (error)
+               goto Exit;
+
        error = freeze_processes();
        if (error)
                goto Free_bitmaps;
@@ -658,9 +658,8 @@ int hibernate(void)
  Thaw:
        thaw_processes();
  Free_bitmaps:
-       free_basic_memory_bitmaps();
- Enable_umh:
        usermodehelper_enable();
+       free_basic_memory_bitmaps();
  Exit:
        pm_notifier_call_chain(PM_POST_HIBERNATION);
        pm_restore_console();
@@ -775,15 +774,13 @@ static int software_resume(void)
        if (error)
                goto close_finish;
 
-       error = usermodehelper_disable();
+       error = create_basic_memory_bitmaps();
        if (error)
                goto close_finish;
 
-       error = create_basic_memory_bitmaps();
-       if (error) {
-               usermodehelper_enable();
+       error = usermodehelper_disable();
+       if (error)
                goto close_finish;
-       }
 
        pr_debug("PM: Preparing processes for restore.\n");
        error = freeze_processes();
@@ -803,8 +800,8 @@ static int software_resume(void)
        swsusp_free();
        thaw_processes();
  Done:
-       free_basic_memory_bitmaps();
        usermodehelper_enable();
+       free_basic_memory_bitmaps();
  Finish:
        pm_notifier_call_chain(PM_POST_RESTORE);
        pm_restore_console();