summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLaurent Badel <laurentbadel@eaton.com>2021-01-22 17:19:41 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-03 23:28:40 +0100
commitc95981ecd9858a4c5da9f6095dbb5f02ef3befec (patch)
treebdb7d21f3ec52229256d3f6cb94c1fbf7c06f0fd /kernel
parente6e9ded8ffa495f3191e90cc945a03e6059d0827 (diff)
PM: hibernate: flush swap writer after marking
commit fef9c8d28e28a808274a18fbd8cc2685817fd62a upstream. Flush the swap writer after, not before, marking the files, to ensure the signature is properly written. Fixes: 6f612af57821 ("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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/swap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index c73f2e295167..72e33054a2e1 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -497,10 +497,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)