* Fix suspend with NFS mounts active
@ 2003-06-18 10:48 Pavel Machek
0 siblings, 0 replies; only message in thread
From: Pavel Machek @ 2003-06-18 10:48 UTC (permalink / raw)
To: trond.myklebust, Rusty trivial patch monkey Russell, kernel list
Hi!
This fixes suspend with NFS mounts active. Please apply,
Pavel
--- /usr/src/tmp/linux/fs/lockd/svc.c 2003-02-15 18:51:27.000000000 +0100
+++ /usr/src/linux/fs/lockd/svc.c 2003-06-15 20:17:30.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/sunrpc/svcsock.h>
#include <linux/lockd/lockd.h>
#include <linux/nfs.h>
+#include <linux/suspend.h>
#define NLMDBG_FACILITY NLMDBG_SVC
#define LOCKD_BUFSIZE (1024 + NLMSVC_XDRSIZE)
@@ -118,9 +119,11 @@
* NFS mount or NFS daemon has gone away, and we've been sent a
* signal, or else another process has taken over our job.
*/
- while ((nlmsvc_users || !signalled()) && nlmsvc_pid == current->pid)
- {
+ while ((nlmsvc_users || !signalled()) && nlmsvc_pid == current->pid) {
long timeout = MAX_SCHEDULE_TIMEOUT;
+
+ if (current->flags & PF_FREEZE)
+ refrigerator(PF_IOTHREAD);
if (signalled()) {
flush_signals(current);
if (nlmsvc_ops) {
--- /usr/src/tmp/linux/net/sunrpc/sched.c 2003-05-27 13:44:18.000000000 +0200
+++ /usr/src/linux/net/sunrpc/sched.c 2003-06-15 20:16:46.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/spinlock.h>
+#include <linux/suspend.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/xprt.h>
@@ -969,6 +970,8 @@
flush_signals(current);
}
__rpc_schedule();
+ if (current->flags & PF_FREEZE)
+ refrigerator(PF_IOTHREAD);
if (++rounds >= 64) { /* safeguard */
schedule();
--
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-06-18 10:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-06-18 10:48 Fix suspend with NFS mounts active Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).