Commit cefcf24b authored by Thomas Zeitlhofer's avatar Thomas Zeitlhofer Committed by Rafael J. Wysocki
Browse files

PM: hibernate: use correct mode for swsusp_close() 



Commit 39fbef4b ("PM: hibernate: Get block device exclusively in
swsusp_check()") changed the opening mode of the block device to
(FMODE_READ | FMODE_EXCL).

In the corresponding calls to swsusp_close(), the mode is still just
FMODE_READ which triggers the warning in blkdev_flush_mapping() on
resume from hibernate.

So, use the mode (FMODE_READ | FMODE_EXCL) also when closing the
device.

Fixes: 39fbef4b ("PM: hibernate: Get block device exclusively in swsusp_check()")
Signed-off-by: default avatarThomas Zeitlhofer <thomas.zeitlhofer+lkml@ze-it.at>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 13605725

kernel/power/hibernate.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}