[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>

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index a4ab6dd7661f33c5114ea8113b0e496f4a388df0..e8c7765419e8c8e55e0f8a9d3a6706c149fcabba 100644 (file)
--- 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. */