PM: Fix pm_notifiers during user mode hibernation (ebae2604) · Commits · 戴 / test

Snapshot device is opened with O_RDONLY during suspend and O_WRONLY durig resume. Make sure we also call notifiers with correct parameter telling them what we are really doing. Signed-off-by:

Andrey Borzenkov <arvidjaar@mail.ru> Signed-off-by:

Rafael J. Wysocki <rjw@sisk.pl> Cc: Len Brown <lenb@kernel.org> Cc: Greg KH <gregkh@suse.de> Acked-by:

Pavel Machek <pavel@ucw.cz> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

kernel/power/user.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -95,15 +95,15 @@ static int snapshot_open(struct inode inode, struct file filp)
		data->swap = swsusp_resume_device ?
		swap_type_of(swsusp_resume_device, 0, NULL) : -1;
		data->mode = O_RDONLY;
		error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
		error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
		if (error)
		pm_notifier_call_chain(PM_POST_RESTORE);
		pm_notifier_call_chain(PM_POST_HIBERNATION);
		} else {
		data->swap = -1;
		data->mode = O_WRONLY;
		error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
		error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
		if (error)
		pm_notifier_call_chain(PM_POST_HIBERNATION);
		pm_notifier_call_chain(PM_POST_RESTORE);
		}
		if (error)
		atomic_inc(&snapshot_device_available);

Admin message