Skip to content

Commit

Permalink
[PATCH] knfsd: lockd: fix use of h_nextrebind
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Olaf Kirch authored and Linus Torvalds committed Oct 4, 2006
1 parent 460f5ca commit 0ade060
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/lockd/clntlock.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ reclaimer(void *ptr)
/* 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. */
Expand Down

0 comments on commit 0ade060

Please sign in to comment.