diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-05-26 14:51:00 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-05-26 14:51:00 -0400 |
| commit | 95baa25c7321eb8613246acbf61b97911cc748d3 (patch) | |
| tree | 3aea4952f4721c2c456ac2b5d056c8db34dd2e6d /fs | |
| parent | d0367a508af9cf97beb202935bb9ad8883d30cd1 (diff) | |
| download | linux-3.10-95baa25c7321eb8613246acbf61b97911cc748d3.tar.gz linux-3.10-95baa25c7321eb8613246acbf61b97911cc748d3.tar.bz2 linux-3.10-95baa25c7321eb8613246acbf61b97911cc748d3.zip | |
NFSv4: Fix the case where NFSv4 renewal fails
If the asynchronous lease renewal fails (usually due to a soft timeout),
then we _must_ schedule state recovery in order to ensure that we don't
lose the lease unnecessarily or, if the lease is already lost, that we
recover the locking state promptly...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index a4d24268029..4674f8092da 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2594,12 +2594,9 @@ static void nfs4_renew_done(struct rpc_task *task, void *data) unsigned long timestamp = (unsigned long)data; if (task->tk_status < 0) { - switch (task->tk_status) { - case -NFS4ERR_STALE_CLIENTID: - case -NFS4ERR_EXPIRED: - case -NFS4ERR_CB_PATH_DOWN: - nfs4_schedule_state_recovery(clp); - } + /* Unless we're shutting down, schedule state recovery! */ + if (test_bit(NFS_CS_RENEWD, &clp->cl_res_state) != 0) + nfs4_schedule_state_recovery(clp); return; } spin_lock(&clp->cl_lock); |