From: Trond Myklebust Date: Mon, 14 May 2007 20:50:44 +0000 (-0400) Subject: NLM: Fix locking client timeouts... X-Git-Tag: v2.6.22-rc2~13^2~12 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21051ba6259c519e20a7d575ddceb16e84ad2a5d;p=linux-2.6 NLM: Fix locking client timeouts... nlmsvc_timeout is already in units of HZ... Signed-off-by: Trond Myklebust --- diff --git a/fs/lockd/host.c b/fs/lockd/host.c index ad21c0713e..96070bff93 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,