diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-10-18 06:04:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:18 -0400 |
commit | 232b14328050a4639130b0dec185f43968e72035 (patch) | |
tree | eb3b525278bd3efd5403bc4f5cfb3e41614d40c4 /kernel/power/main.c | |
parent | 2776365370b579afc36cff14dc70a567b66f0378 (diff) |
freezer: do not sync filesystems from freeze_processes
The syncing of filesystems from within the freezer is generally not needed.
Also, if there's an ext3 filesystem loopback-mounted from a FUSE one, the
syncing results in writes to it and deadlocks. Similarly, it will deadlock if
FUSE implements sync.
Change freeze_processes() so that it doesn't execute sys_sync() and make the
suspend and hibernation code path sync filesystems independently of the
freezer.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r-- | kernel/power/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index fb2412e7a0ce..3cdf95b1dc92 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/resume-trace.h> | 20 | #include <linux/resume-trace.h> |
21 | #include <linux/freezer.h> | 21 | #include <linux/freezer.h> |
22 | #include <linux/vmstat.h> | 22 | #include <linux/vmstat.h> |
23 | #include <linux/syscalls.h> | ||
23 | 24 | ||
24 | #include "power.h" | 25 | #include "power.h" |
25 | 26 | ||
@@ -230,9 +231,14 @@ static int enter_state(suspend_state_t state) | |||
230 | 231 | ||
231 | if (!valid_state(state)) | 232 | if (!valid_state(state)) |
232 | return -ENODEV; | 233 | return -ENODEV; |
234 | |||
233 | if (!mutex_trylock(&pm_mutex)) | 235 | if (!mutex_trylock(&pm_mutex)) |
234 | return -EBUSY; | 236 | return -EBUSY; |
235 | 237 | ||
238 | printk("Syncing filesystems ... "); | ||
239 | sys_sync(); | ||
240 | printk("done.\n"); | ||
241 | |||
236 | pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]); | 242 | pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]); |
237 | if ((error = suspend_prepare())) | 243 | if ((error = suspend_prepare())) |
238 | goto Unlock; | 244 | goto Unlock; |