summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-01-29 12:26:57 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-01-29 12:26:57 -0500
commit905e7dafbe1c69dd69197a9e8ba2e4bf518c9926 (patch)
tree519e1a96e572d220707135ac355328a138d2f4cc /fs/nfs
parenta13ce7c629366880c1072d4d113d3dab6c53510d (diff)
NFSv4.1: Cleanup
It is now completely safe to call nfs41_sequence_free_slot with a NULL slot. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4filelayout.c6
1 files 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;
}