From: Olaf Kirch 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 Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- fs/lockd/clntlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/lockd/clntlock.c~knfsd-lockd-fix-use-of-h_nextrebind fs/lockd/clntlock.c --- a/fs/lockd/clntlock.c~knfsd-lockd-fix-use-of-h_nextrebind +++ a/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. */ _