NFSv4.1: Cleanup
authorTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 29 Jan 2014 17:26:57 +0000 (12:26 -0500)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 29 Jan 2014 17:26:57 +0000 (12:26 -0500)
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

index 20a56fa..12c8132 100644 (file)
@@ -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;
        }