From 0ade060ee51b9b6cf18d580405dc9ab90067f69f Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Wed, 4 Oct 2006 02:16:04 -0700 Subject: [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 Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/lockd/clntlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs/lockd') diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index a4ab6dd7661..e8c7765419e 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. */ -- cgit v1.2.3-70-g09d2