[PATCH 3/3] NFSv4.1: Cleanup

Trond Myklebust
2014-01-29T17:36:28Z

It is now completely safe to call nfs41_sequence_free_slot with a NULL
slot.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/nfs4filelayout.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 20a56fa271bd..12c8132ad408 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -336,8 +336,7 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data)

if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) &&
task->tk_status == 0) {
- if (rdata->res.seq_res.sr_slot != NULL)
- nfs41_sequence_done(task, &rdata->res.seq_res);
+ nfs41_sequence_done(task, &rdata->res.seq_res);
return;
}

@@ -446,8 +445,7 @@ static void filelayout_write_call_done(struct rpc_task *task, void *data)

if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&
task->tk_status == 0) {
- if (wdata->res.seq_res.sr_slot != NULL)
- nfs41_sequence_done(task, &wdata->res.seq_res);
+ nfs41_sequence_done(task, &wdata->res.seq_res);
return;
}

--
1.8.5.3