From: "Brian O'Keefe" <okeefe@spinnakernet.com>
To: trond.myklebust@fys.uio.no
Cc: Andrew Morton <andrewm@uow.edu.au>,
Linus Torvalds <torvalds@transmeta.com>,
lkml <linux-kernel@vger.kernel.org>
Subject: Re: NFS client deadlock on SMP machines
Date: Wed, 10 Jan 2001 07:42:05 -0500 [thread overview]
Message-ID: <3A5C589D.DC8A90AA@spinnakernet.com> (raw)
In-Reply-To: <3A5B42BF.EC16F7EE@spinnakernet.com> <3A5C1CF2.170E0A04@uow.edu.au> <14940.12224.406961.510615@charged.uio.no>
Trond Myklebust wrote:
> Doh. You're quite right on both accounts. I made a small modification
> to your patch for the rpc_new_task() problem (you forgot to release
> the RPC task if it's not used).
>
> Linus, please apply for 2.4.1...
Thanks guys! I'm testing it now, and so far, so good. I've merged
Andrew's and Trond's patches into one:
*******************************************
--- linux-2.4.0/fs/nfs/flushd.c.orig Wed Jan 10 07:18:32 2001
+++ linux-2.4.0/fs/nfs/flushd.c Wed Jan 10 07:18:38 2001
@@ -55,7 +55,7 @@
/*
* Spinlock
*/
-spinlock_t nfs_flushd_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t nfs_flushd_lock = SPIN_LOCK_UNLOCKED;
/*
* Local function declarations.
@@ -71,18 +71,17 @@
int status = 0;
dprintk("NFS: writecache_init\n");
+
+ /* Create the RPC task */
+ if (!(task = rpc_new_task(server->client, NULL,
RPC_TASK_ASYNC)))
+ return -ENOMEM;
+
spin_lock(&nfs_flushd_lock);
cache = server->rw_requests;
if (cache->task)
goto out_unlock;
- /* Create the RPC task */
- status = -ENOMEM;
- task = rpc_new_task(server->client, NULL, RPC_TASK_ASYNC);
- if (!task)
- goto out_unlock;
-
task->tk_calldata = server;
cache->task = task;
@@ -99,6 +98,7 @@
return 0;
out_unlock:
spin_unlock(&nfs_flushd_lock);
+ rpc_release_task(task);
return status;
}
@@ -195,7 +195,9 @@
if (*q) {
*q = inode->u.nfs_i.hash_next;
NFS_FLAGS(inode) &= ~NFS_INO_FLUSH;
+ spin_unlock(&nfs_flushd_lock);
iput(inode);
+ return;
}
out:
spin_unlock(&nfs_flushd_lock);
*******************************************
Brian O'Keefe
Spinnaker Networks, Inc.
okeefe@spinnakernet.com
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
prev parent reply other threads:[~2001-01-10 12:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <3A5B42BF.EC16F7EE@spinnakernet.com>
2001-01-10 8:27 ` Andrew Morton
2001-01-10 9:47 ` Trond Myklebust
2001-01-10 12:42 ` Brian O'Keefe [this message]
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=3A5C589D.DC8A90AA@spinnakernet.com \
--to=okeefe@spinnakernet.com \
--cc=andrewm@uow.edu.au \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
--cc=trond.myklebust@fys.uio.no \
/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
Powered by JetHome