aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-13 16:43:06 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-02-03 18:35:08 -0500
commita6a352e93dfa78db8903f0e3610abb76efbf7fc9 (patch)
tree841b538d544444ab6f65102d5c444f72b4ecd869
parent7c85d9007d05436e71d2b805b96c1e36a8193bd4 (diff)
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>
-rw-r--r--fs/nfs/nfs4proc.c6
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)
1140 break; 1140 break;
1141 case -NFS4ERR_STALE_STATEID: 1141 case -NFS4ERR_STALE_STATEID:
1142 case -NFS4ERR_EXPIRED: 1142 case -NFS4ERR_EXPIRED:
1143 nfs4_schedule_state_recovery(server->nfs_client);
1144 break; 1143 break;
1145 default: 1144 default:
1146 if (nfs4_async_handle_error(task, server) == -EAGAIN) { 1145 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
2955 switch (err) { 2954 switch (err) {
2956 case -NFS4ERR_STALE_STATEID: 2955 case -NFS4ERR_STALE_STATEID:
2957 case -NFS4ERR_EXPIRED: 2956 case -NFS4ERR_EXPIRED:
2958 nfs4_schedule_state_recovery(server->nfs_client);
2959 case 0: 2957 case 0:
2960 return 0; 2958 return 0;
2961 } 2959 }
@@ -3109,12 +3107,10 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
3109 break; 3107 break;
3110 case -NFS4ERR_STALE_STATEID: 3108 case -NFS4ERR_STALE_STATEID:
3111 case -NFS4ERR_EXPIRED: 3109 case -NFS4ERR_EXPIRED:
3112 nfs4_schedule_state_recovery(calldata->server->nfs_client);
3113 break; 3110 break;
3114 default: 3111 default:
3115 if (nfs4_async_handle_error(task, calldata->server) == -EAGAIN) { 3112 if (nfs4_async_handle_error(task, calldata->server) == -EAGAIN)
3116 rpc_restart_call(task); 3113 rpc_restart_call(task);
3117 }
3118 } 3114 }
3119} 3115}
3120 3116