diff options
| author | Olaf Kirch <okir@suse.de> | 2006-10-04 05:16:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:18 -0400 |
| commit | 0ade060ee51b9b6cf18d580405dc9ab90067f69f (patch) | |
| tree | cb4973c837192053f5e2b2a5b2e3790362849d00 | |
| parent | 460f5cac1e24e947509b6112c99c5bc9ff687b45 (diff) | |
[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>
| -rw-r--r-- | fs/lockd/clntlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index a4ab6dd7661f..e8c7765419e8 100644 --- a/fs/lockd/clntlock.c +++ b/fs/lockd/clntlock.c | |||
| @@ -184,7 +184,7 @@ restart: | |||
| 184 | /* Force a portmap getport - the peer's lockd will | 184 | /* Force a portmap getport - the peer's lockd will |
| 185 | * most likely end up on a different port. | 185 | * most likely end up on a different port. |
| 186 | */ | 186 | */ |
| 187 | host->h_nextrebind = 0; | 187 | host->h_nextrebind = jiffies; |
| 188 | nlm_rebind_host(host); | 188 | nlm_rebind_host(host); |
| 189 | 189 | ||
| 190 | /* First, reclaim all locks that have been granted. */ | 190 | /* First, reclaim all locks that have been granted. */ |