lkml.org 
[lkml]   [2003]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[FIX, please test] Re: 2.5.70-bk16 - nfs interferes with s4bios suspend
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?]
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:36    [W:0.055 / U:6.452 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site