diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-13 16:43:06 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-03 15:35:08 -0800 |
| commit | a6a352e93dfa78db8903f0e3610abb76efbf7fc9 (patch) | |
| tree | 841b538d544444ab6f65102d5c444f72b4ecd869 /fs/nfs | |
| parent | 7c85d9007d05436e71d2b805b96c1e36a8193bd4 (diff) | |
| download | linux-stable-a6a352e93dfa78db8903f0e3610abb76efbf7fc9.tar.gz linux-stable-a6a352e93dfa78db8903f0e3610abb76efbf7fc9.tar.bz2 linux-stable-a6a352e93dfa78db8903f0e3610abb76efbf7fc9.zip | |
NFSv4: Don't start state recovery in nfs4_close_done()
We might not even have any open files at this point...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 5b2446173dd8..35bfcced2c75 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1140,7 +1140,6 @@ static void nfs4_close_done(struct rpc_task *task, void *data) break; case -NFS4ERR_STALE_STATEID: case -NFS4ERR_EXPIRED: - nfs4_schedule_state_recovery(server->nfs_client); break; default: if (nfs4_async_handle_error(task, server) == -EAGAIN) { @@ -2955,7 +2954,6 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4 switch (err) { case -NFS4ERR_STALE_STATEID: case -NFS4ERR_EXPIRED: - nfs4_schedule_state_recovery(server->nfs_client); case 0: return 0; } @@ -3109,12 +3107,10 @@ static void nfs4_locku_done(struct rpc_task *task, void *data) break; case -NFS4ERR_STALE_STATEID: case -NFS4ERR_EXPIRED: - nfs4_schedule_state_recovery(calldata->server->nfs_client); break; default: - if (nfs4_async_handle_error(task, calldata->server) == -EAGAIN) { + if (nfs4_async_handle_error(task, calldata->server) == -EAGAIN) rpc_restart_call(task); - } } } |