summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-05-14 16:50:44 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-05-14 19:33:44 -0400
commit21051ba6259c519e20a7d575ddceb16e84ad2a5d (patch)
tree78dcaf02ffe66efce5e0ab230e446be435da0d21
parentfaa8b6c3c2e1454175609167a25ae525d075f045 (diff)
downloadblackbird-op-linux-21051ba6259c519e20a7d575ddceb16e84ad2a5d.tar.gz
blackbird-op-linux-21051ba6259c519e20a7d575ddceb16e84ad2a5d.zip
NLM: Fix locking client timeouts...
nlmsvc_timeout is already in units of HZ... Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/lockd/host.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index ad21c0713efa..96070bff93fc 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -221,7 +221,7 @@ nlm_bind_host(struct nlm_host *host)
host->h_nextrebind - jiffies);
}
} else {
- unsigned long increment = nlmsvc_timeout * HZ;
+ unsigned long increment = nlmsvc_timeout;
struct rpc_timeout timeparms = {
.to_initval = increment,
.to_increment = increment,
OpenPOWER on IntegriCloud