From: Mikael Davranche <mikael.davranche@free.fr>
To: Trond Myklebust <Trond.Myklebust@netapp.com>,
Trond Myklebust <trond.myklebust@fys.uio.no>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 2/3] NLM: Proposal for a timeout setting on blocking locks
Date: Tue, 11 Mar 2008 13:16:47 +0100 [thread overview]
Message-ID: <1205237807.47d6782f9b5dd@imp.free.fr> (raw)
In-Reply-To: <1205237665.47d677a143941@imp.free.fr>
# diff -u a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
--- a/fs/lockd/clntproc.c Tue Feb 26 01:20:20 2008
+++ b/fs/lockd/clntproc.c Fri Mar 7 18:08:58 2008
@@ -20,7 +20,6 @@
#define NLMDBG_FACILITY NLMDBG_CLIENT
#define NLMCLNT_GRACE_WAIT (5*HZ)
-#define NLMCLNT_POLL_TIMEOUT (30*HZ)
#define NLMCLNT_MAX_RETRIES 3
static int nlmclnt_test(struct nlm_rqst *, struct file_lock *);
@@ -525,7 +524,9 @@
if (resp->status != nlm_lck_blocked)
break;
/* Wait on an NLM blocking lock */
- status = nlmclnt_block(block, req, NLMCLNT_POLL_TIMEOUT);
+ if (!nlm_clnt_poll_timeout)
+ nlm_clnt_poll_timeout = NLMCLNT_POLL_TIMEOUT;
+ status = nlmclnt_block(block, req, nlm_clnt_poll_timeout * HZ);
/* if we were interrupted. Send a CANCEL request to the server
* and exit
*/
next prev parent reply other threads:[~2008-03-11 12:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-11 12:14 [PATCH 0/3] NLM: Proposal for a timeout setting on blocking locks Mikael Davranche
2008-03-11 12:15 ` [PATCH 1/3] " Mikael Davranche
2008-03-11 12:16 ` Mikael Davranche [this message]
2008-03-11 12:18 ` [PATCH 3/3] " Mikael Davranche
2008-03-11 23:25 ` [PATCH 0/3] " Trond Myklebust
2008-03-12 11:26 ` Mikael Davranche
2008-03-12 13:33 ` Trond Myklebust
2008-03-12 15:51 ` Mikael Davranche
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=1205237807.47d6782f9b5dd@imp.free.fr \
--to=mikael.davranche@free.fr \
--cc=Trond.Myklebust@netapp.com \
--cc=linux-fsdevel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).