PM/Hibernate: Refactor and simplify freezer_test_done
Subsystems (2)
PATCH 1/1 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.
---
kernel/power/hibernate.c | 10 +++++----- kernel/power/user.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)
kernel/power/hibernate.c +5 -5
@@ -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 ();
kernel/power/user.c +2 -2
@@ -251,10 +251,10 @@ 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; +else if (!error) + data->ready =1 ; }break ;
kernel/power/user.c static long snapshot_ioctl(struct file *filp, unsigned int cmd, · line 257
Quoted 10 lines · Srivatsa S. Bhat
kernel/power/user.c +2
-2@@ -251,10 +251,10 @@ 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; +else if (!error) + data->ready =1 ;
Hmmm... how about..
data->ready = !freezer_test_done && !error; freezer_test_done = false;
Signature · 1 line
tejun
Quoted 14 lines · Tejun Heo
Review static long snapshot_ioctl(struct file *filp, unsigned int cmd, · line 257
Quoted 10 lines · Srivatsa S. Bhat
(quoted diff) +2
-2@@ -251,10 +251,10 @@ 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; + else if (!error) + data->ready = 1;Hmmm... how about..
Quoted 3 lines
data->ready = !freezer_test_done && !error; freezer_test_done = false;
That looks even better, thanks!
Here is the updated patch:
From: Srivatsa S. Bhat <[email protected]>
Subject: [PATCH] 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.
---
kernel/power/hibernate.c | 10 +++++----- kernel/power/user.c | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-)
kernel/power/hibernate.c +5 -5
@@ -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 ();
kernel/power/user.c +2 -4
@@ -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 ;
Rafael J. Wysocki
AppliedQuoted 25 lines · Srivatsa S. Bhat
Quoted 14 lines · Tejun Heo
kernel/power/user.c static long snapshot_ioctl(struct file *filp, unsigned int cmd, · line 257
Quoted 10 lines · Srivatsa S. Bhat
kernel/power/user.c +2
-2@@ -251,10 +251,10 @@ 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; +else if (!error) + data->ready =1 ;Hmmm... how about..
Quoted 3 lines
data->ready = !freezer_test_done && !error; freezer_test_done = false;That looks even better, thanks!
Here is the updated patch:
Quoted 7 lines
From: Srivatsa S. Bhat <[email protected]>
Subject: [PATCH] PM/Hibernate: Refactor and simplifyfreezer_test_doneThe code related to '
freezer_test_done' is needlessly convoluted. Refactor the code and simplify the implementation.Signed-off-by Srivatsa S. Bhat <[email protected]>
Applied.
Thanks,
Rafael
Quoted 56 lines
---
kernel/power/hibernate.c | 10 +++++----- kernel/power/user.c | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-)kernel/power/hibernate.c +5
-5@@ -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 ();kernel/power/user.c +2
-4@@ -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 ;