From: Pavel Machek <pavel@suse.cz>
To: CaT <cat@zip.com.au>
Cc: swsusp@lister.fornax.hu, linux-kernel@vger.kernel.org
Subject: [FIX, please test] Re: 2.5.70-bk16 - nfs interferes with s4bios suspend
Date: Sun, 15 Jun 2003 20:31:11 +0200 [thread overview]
Message-ID: <20030615183111.GD315@elf.ucw.cz> (raw)
In-Reply-To: <20030613033703.GA526@zip.com.au>
Hi!
> stopping tasks failed (2 tasks remaining)
> Suspend failed: Not all processes stopped!
> Restarting tasks...<6> Strange, rpciod not stopped
This should fix it... Someone please test it.
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>
@@ -286,7 +287,7 @@
*/
void rpciod_wake_up(void)
{
- if(rpciod_pid==0)
+ if (rpciod_pid==0)
printk(KERN_ERR "rpciod: wot no daemon?\n");
if (waitqueue_active(&rpciod_idle))
wake_up(&rpciod_idle);
@@ -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?]
next prev parent reply other threads:[~2003-06-15 18:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-06-13 3:37 2.5.70-bk16 - nfs interferes with s4bios suspend CaT
2003-06-13 6:30 ` Pavel Machek
2003-06-15 18:06 ` Pavel Machek
2003-06-15 23:00 ` CaT
2003-06-15 23:16 ` Pavel Machek
2003-06-15 18:31 ` Pavel Machek [this message]
2003-06-16 0:11 ` [FIX, please test] " CaT
2003-06-16 1:41 ` [Swsusp] " Michael Frank
2003-06-16 10:47 ` Pavel Machek
2003-06-18 8:16 ` CaT
2003-06-18 10:17 ` Pavel Machek
2003-06-18 10:26 ` CaT
2003-06-18 10:35 ` Pavel Machek
2003-06-21 14:24 ` can't get linux to perform a bios suspend (was: Re: [FIX, please test] Re: 2.5.70-bk16 - nfs interferes with s4bios suspend) CaT
2003-06-22 15:15 ` Pavel Machek
2003-06-23 0:58 ` CaT
2003-06-23 9:50 ` Pavel Machek
2003-06-23 9:58 ` CaT
2003-07-01 8:03 ` CaT
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030615183111.GD315@elf.ucw.cz \
--to=pavel@suse.cz \
--cc=cat@zip.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=swsusp@lister.fornax.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).