diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-09-14 22:03:14 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-09-23 07:25:03 +0400 |
| commit | 6b30954ebb569fa1b2abdb21f2f4290eec76bf80 (patch) | |
| tree | 8d342c0709eeb7c0b442db29b6b3754572e75689 /fs/nfs | |
| parent | 97db8f41792839a6912fd21be8b61dd6c50db58f (diff) | |
| download | linux-6b30954ebb569fa1b2abdb21f2f4290eec76bf80.tar.xz | |
NFSv4: Retry lease recovery if it failed during a synchronous operation.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 7f60beb40df3..c218cc450b92 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -793,10 +793,17 @@ out: int nfs4_recover_expired_lease(struct nfs_server *server) { struct nfs_client *clp = server->nfs_client; + int ret; - if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) + for (;;) { + ret = nfs4_wait_clnt_recover(server->client, clp); + if (ret != 0) + return ret; + if (!test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) + break; nfs4_schedule_state_recovery(clp); - return nfs4_wait_clnt_recover(server->client, clp); + } + return 0; } /* |