diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-17 20:14:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-17 20:14:43 -0700 |
| commit | b42895d6fe66995ab101c15d9a59c78474dbf382 (patch) | |
| tree | 34c518a9fd51385848eb2f1017c9b0b81757a2c6 /fs/lockd/host.c | |
| parent | d3a36fb82a0864a85e238ac946817030a18c5f9a (diff) | |
| parent | dd504ea16f34a29da4aa933ae7ab917fcfd25fd7 (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
SUNRPC: Fix sparse warnings
NLM: Fix sparse warnings
NFS: Fix more sparse warnings
NFS: Fix some 'sparse' warnings...
SUNRPC: remove dead variable 'rpciod_running'
NFS4: Fix incorrect use of sizeof() in fs/nfs/nfs4xdr.c
NFS: use zero_user_page
NLM: don't use CLONE_SIGHAND in nlmclnt_recovery
NLM: Fix locking client timeouts...
Diffstat (limited to 'fs/lockd/host.c')
| -rw-r--r-- | fs/lockd/host.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index ad21c0713ef..96070bff93f 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, |