* [PATCH -next] PM:hibernate:fix miss close 'hib_resume_bdev' in load_image_and_restore
@ 2022-02-09 11:29 Ye Bin
2022-02-16 18:48 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Ye Bin @ 2022-02-09 11:29 UTC (permalink / raw)
To: rafael, len.brown, pavel, linux-pm; +Cc: tytso, linux-kernel, jack, Ye Bin
As 'swsusp_check' open 'hib_resume_bdev', if call 'create_basic_memory_bitmaps'
failed, we need to close 'hib_resume_bdev' in 'load_image_and_restore' function.
Signed-off-by: Ye Bin <yebin10@huawei.com>
---
kernel/power/hibernate.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index e6af502c2fd7..49d1df0218cb 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -689,8 +689,10 @@ static int load_image_and_restore(void)
lock_device_hotplug();
error = create_basic_memory_bitmaps();
- if (error)
+ if (error) {
+ swsusp_close(FMODE_READ | FMODE_EXCL);
goto Unlock;
+ }
error = swsusp_read(&flags);
swsusp_close(FMODE_READ | FMODE_EXCL);
--
2.31.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH -next] PM:hibernate:fix miss close 'hib_resume_bdev' in load_image_and_restore
2022-02-09 11:29 [PATCH -next] PM:hibernate:fix miss close 'hib_resume_bdev' in load_image_and_restore Ye Bin
@ 2022-02-16 18:48 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2022-02-16 18:48 UTC (permalink / raw)
To: Ye Bin
Cc: Rafael J. Wysocki, Len Brown, Pavel Machek, Linux PM,
Ted Ts'o, Linux Kernel Mailing List, Jan Kara
On Wed, Feb 9, 2022 at 12:13 PM Ye Bin <yebin10@huawei.com> wrote:
>
> As 'swsusp_check' open 'hib_resume_bdev', if call 'create_basic_memory_bitmaps'
> failed, we need to close 'hib_resume_bdev' in 'load_image_and_restore' function.
>
> Signed-off-by: Ye Bin <yebin10@huawei.com>
> ---
> kernel/power/hibernate.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index e6af502c2fd7..49d1df0218cb 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -689,8 +689,10 @@ static int load_image_and_restore(void)
>
> lock_device_hotplug();
> error = create_basic_memory_bitmaps();
> - if (error)
> + if (error) {
> + swsusp_close(FMODE_READ | FMODE_EXCL);
> goto Unlock;
> + }
>
> error = swsusp_read(&flags);
> swsusp_close(FMODE_READ | FMODE_EXCL);
> --
Applied as 5.18 material, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-16 18:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-09 11:29 [PATCH -next] PM:hibernate:fix miss close 'hib_resume_bdev' in load_image_and_restore Ye Bin
2022-02-16 18:48 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®