summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>2012-02-17 23:39:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-02 10:32:10 -0700
commit7ca476a690a89202e0693948c4df0f9a34a566b1 (patch)
treeb7261afe9cb3caa1a7b1066be4b503599e4877b9
parentf8fbfe8809d64f3d3aabbaabe85c8571b754b9bd (diff)
downloadlwn-7ca476a690a89202e0693948c4df0f9a34a566b1.tar.gz
lwn-7ca476a690a89202e0693948c4df0f9a34a566b1.zip
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>
-rw-r--r--kernel/power/hibernate.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 6d6d28870335..7bef75550068 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -616,7 +616,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();
@@ -624,7 +624,7 @@ int hibernate(void)
error = freeze_processes();
if (error)
- goto Finish;
+ goto Free_bitmaps;
error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
if (error)
@@ -657,8 +657,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);