summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorOlaf Kirch <okir@suse.de>2006-10-04 02:16:04 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 07:55:18 -0700
commit0ade060ee51b9b6cf18d580405dc9ab90067f69f (patch)
treecb4973c837192053f5e2b2a5b2e3790362849d00 /fs/lockd
parent460f5cac1e24e947509b6112c99c5bc9ff687b45 (diff)
downloadop-kernel-dev-0ade060ee51b9b6cf18d580405dc9ab90067f69f.zip
op-kernel-dev-0ade060ee51b9b6cf18d580405dc9ab90067f69f.tar.gz
[PATCH] knfsd: lockd: fix use of h_nextrebind
nlmclnt_recovery would try to force a portmap rebind by setting host->h_nextrebind to 0. The right thing to do here is to set it to the current time. Signed-off-by: Olaf Kirch <okir@suse.de> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/clntlock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index a4ab6dd..e8c7765 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -184,7 +184,7 @@ restart:
/* Force a portmap getport - the peer's lockd will
* most likely end up on a different port.
*/
- host->h_nextrebind = 0;
+ host->h_nextrebind = jiffies;
nlm_rebind_host(host);
/* First, reclaim all locks that have been granted. */
OpenPOWER on IntegriCloud