[PATCH 018 of 19] knfsd: lockd: fix use of h_nextrebind

From: NeilBrown
Date: Fri Sep 01 2006 - 00:38:26 EST



From: Olaf Kirch <okir@xxxxxxx>

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: okir@xxxxxxx
Signed-off-by: Neil Brown <neilb@xxxxxxx>

### Diffstat output
./fs/lockd/clntlock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff .prev/fs/lockd/clntlock.c ./fs/lockd/clntlock.c
--- .prev/fs/lockd/clntlock.c 2006-08-31 17:02:23.000000000 +1000
+++ ./fs/lockd/clntlock.c 2006-09-01 12:19:55.000000000 +1000
@@ -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. */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/