PM: hibernate: flush swap writer after marking

laurentbadel-eaton · ksacilotto · commit 668fd82ada66 · 2021-03-24T11:11:21.000+01:00
BugLink: https://bugs.launchpad.net/bugs/1916056 commit fef9c8d upstream. ﻿Flush the swap writer after, not before, marking the files, to ensure the signature is properly written. Fixes: 6f612af ("PM / Hibernate: Group swap ops") Signed-off-by: Laurent Badel <laurentbadel@eaton.com> Cc: All applicable <stable@vger.kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
@@ -489,10 +489,10 @@ static int swap_writer_finish(struct swap_map_handle *handle,
 		unsigned int flags, int error)
 {
 	if (!error) {
-		flush_swap_writer(handle);
 		pr_info("S");
 		error = mark_swapfiles(handle, flags);
 		pr_cont("|\n");
+		flush_swap_writer(handle);
 	}
 
 	if (error)

Original file line number	Diff line number	Diff line change
`@@ -489,10 +489,10 @@ static int swap_writer_finish(struct swap_map_handle *handle,`
`489`	`489`	`unsigned int flags, int error)`
`490`	`490`	`{`
`491`	`491`	`if (!error) {`
`492`		`- flush_swap_writer(handle);`
`493`	`492`	`pr_info("S");`
`494`	`493`	`error = mark_swapfiles(handle, flags);`
`495`	`494`	`pr_cont("\|\n");`
	`495`	`+ flush_swap_writer(handle);`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`if (error)`