Commit 0ade060e authored by Olaf Kirch's avatar Olaf Kirch Committed by Linus Torvalds

[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: default avatarOlaf Kirch <okir@suse.de>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 460f5cac
...@@ -184,7 +184,7 @@ reclaimer(void *ptr) ...@@ -184,7 +184,7 @@ reclaimer(void *ptr)
/* Force a portmap getport - the peer's lockd will /* Force a portmap getport - the peer's lockd will
* most likely end up on a different port. * most likely end up on a different port.
*/ */
host->h_nextrebind = 0; host->h_nextrebind = jiffies;
nlm_rebind_host(host); nlm_rebind_host(host);
/* First, reclaim all locks that have been granted. */ /* First, reclaim all locks that have been granted. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment