diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2022-01-10 09:55:44 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-01-10 09:55:44 +0100 |
| commit | c524559acd5d0903fa6e3b8e608bf5851de7217a (patch) | |
| tree | 91acebdb63e32973d08f93c21f44aae0f4c5ccc8 /kernel/power/hibernate.c | |
| parent | Merge branch 'for-5.17/apple' into for-linus (diff) | |
| parent | HID: hidraw: Replace hidraw device table mutex with a rwsem (diff) | |
| download | wireguard-linux-c524559acd5d0903fa6e3b8e608bf5851de7217a.tar.xz wireguard-linux-c524559acd5d0903fa6e3b8e608bf5851de7217a.zip | |
Merge branch 'for-5.17/hidraw' into for-linus
- locking performance improvement for hidraw code (André Almeida)
Diffstat (limited to '')
| -rw-r--r-- | kernel/power/hibernate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 9ed9b744876c..e6af502c2fd7 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -693,7 +693,7 @@ static int load_image_and_restore(void) goto Unlock; error = swsusp_read(&flags); - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); if (!error) error = hibernation_restore(flags & SF_PLATFORM_MODE); @@ -983,7 +983,7 @@ static int software_resume(void) /* The snapshot device should not be opened while we're running */ if (!hibernate_acquire()) { error = -EBUSY; - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); goto Unlock; } @@ -1018,7 +1018,7 @@ static int software_resume(void) pm_pr_dbg("Hibernation image not present or could not be loaded.\n"); return error; Close_Finish: - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); goto Finish; } |