From 26276d9cfc49cfcf9f6040b9a21dc1118a27d769 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 18 Oct 2007 03:04:44 -0700
Subject: [PATCH] --- yaml --- r: 71107 b: refs/heads/master c:
 232b14328050a4639130b0dec185f43968e72035 h: refs/heads/master i:   71105:
 c7bf90fc1a6cf1471b631213908b257e807a4622   71103:
 616683540e0e0600d0c42553cdc2b09fec40d2ea v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/power/disk.c    | 4 ++++
 trunk/kernel/power/main.c    | 6 ++++++
 trunk/kernel/power/process.c | 1 -
 trunk/kernel/power/user.c    | 4 ++++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4fd3e9b6651..dc2ccbf3ee25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2776365370b579afc36cff14dc70a567b66f0378
+refs/heads/master: 232b14328050a4639130b0dec185f43968e72035
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 9348d95a4fb8..555c0f0b2f7e 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -313,6 +313,10 @@ int hibernate(void)
 	if (error)
 		goto Exit;
 
+	printk("Syncing filesystems ... ");
+	sys_sync();
+	printk("done.\n");
+
 	error = prepare_processes();
 	if (error)
 		goto Finish;
diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c
index fb2412e7a0ce..3cdf95b1dc92 100644
--- a/trunk/kernel/power/main.c
+++ b/trunk/kernel/power/main.c
@@ -20,6 +20,7 @@
 #include <linux/resume-trace.h>
 #include <linux/freezer.h>
 #include <linux/vmstat.h>
+#include <linux/syscalls.h>
 
 #include "power.h"
 
@@ -230,9 +231,14 @@ static int enter_state(suspend_state_t state)
 
 	if (!valid_state(state))
 		return -ENODEV;
+
 	if (!mutex_trylock(&pm_mutex))
 		return -EBUSY;
 
+	printk("Syncing filesystems ... ");
+	sys_sync();
+	printk("done.\n");
+
 	pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
 	if ((error = suspend_prepare()))
 		goto Unlock;
diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c
index 3434940a3df1..dba2f3acb4f8 100644
--- a/trunk/kernel/power/process.c
+++ b/trunk/kernel/power/process.c
@@ -191,7 +191,6 @@ int freeze_processes(void)
 	if (error)
 		return error;
 
-	sys_sync();
 	error = try_to_freeze_tasks(FREEZER_KERNEL_THREADS);
 	if (error)
 		return error;
diff --git a/trunk/kernel/power/user.c b/trunk/kernel/power/user.c
index bd0723a7df3f..5bd321bcbb75 100644
--- a/trunk/kernel/power/user.c
+++ b/trunk/kernel/power/user.c
@@ -153,6 +153,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
 		mutex_lock(&pm_mutex);
 		error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
 		if (!error) {
+			printk("Syncing filesystems ... ");
+			sys_sync();
+			printk("done.\n");
+
 			error = freeze_processes();
 			if (error)
 				thaw_processes();