NFSv4.1 free slot before resending I/O to MDS

Fix a dynamic session slot leak where a slot is preallocated and I/O is
resent through the MDS.

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 03fd8be8c0c5..20a56fa271bd 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -335,8 +335,11 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data)
         dprintk("--> %s task->tk_status %d\n", __func__, task->tk_status);
 
         if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) &&
-            task->tk_status == 0)
+            task->tk_status == 0) {
+                if (rdata->res.seq_res.sr_slot != NULL)
+                        nfs41_sequence_done(task, &rdata->res.seq_res);
                 return;
+        }
 
         /* Note this may cause RPC to be resent */
         rdata->header->mds_ops->rpc_call_done(task, data);
@@ -442,8 +445,11 @@ static void filelayout_write_call_done(struct rpc_task *task, void *data)
         struct nfs_write_data *wdata = data;
 
         if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&
-            task->tk_status == 0)
+            task->tk_status == 0) {
+                if (wdata->res.seq_res.sr_slot != NULL)
+                        nfs41_sequence_done(task, &wdata->res.seq_res);
                 return;
+        }
 
         /* Note this may cause RPC to be resent */
         wdata->header->mds_ops->rpc_call_done(task, data);