aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-05 19:32:19 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-05 19:32:19 -0500
commitd61e612a728fb9bf848c4383f8f6645e822d5b57 (patch)
treeb4024efc797fa3b992b042f484574c1d43893a61 /fs/nfs/write.c
parentf26468fb9384e73fb357d2e84d3e9c88c7d1129d (diff)
NFSv41: Clean up slot table management
We no longer need to maintain a distinction between nfs41_sequence_done and nfs41_sequence_free_slot. This fixes a number of slot table leakages in the NFSv4.1 code. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 556668ff0224..d546c607de08 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1216,8 +1216,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
1216 */ 1216 */
1217 argp->stable = NFS_FILE_SYNC; 1217 argp->stable = NFS_FILE_SYNC;
1218 } 1218 }
1219 nfs4_restart_rpc(task, server->nfs_client, 1219 nfs4_restart_rpc(task, server->nfs_client);
1220 &data->res.seq_res);
1221 return -EAGAIN; 1220 return -EAGAIN;
1222 } 1221 }
1223 if (time_before(complain, jiffies)) { 1222 if (time_before(complain, jiffies)) {
@@ -1229,7 +1228,6 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
1229 /* Can't do anything about it except throw an error. */ 1228 /* Can't do anything about it except throw an error. */
1230 task->tk_status = -EIO; 1229 task->tk_status = -EIO;
1231 } 1230 }
1232 nfs4_sequence_free_slot(server->nfs_client, &data->res.seq_res);
1233 return 0; 1231 return 0;
1234} 1232}
1235 1233