Skip to content

Commit 905e7da

Browse files
committed
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>
1 parent a13ce7c commit 905e7da

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

fs/nfs/nfs4filelayout.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,7 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data)
336336

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

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

447446
if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&
448447
task->tk_status == 0) {
449-
if (wdata->res.seq_res.sr_slot != NULL)
450-
nfs41_sequence_done(task, &wdata->res.seq_res);
448+
nfs41_sequence_done(task, &wdata->res.seq_res);
451449
return;
452450
}
453451

0 commit comments

Comments
 (0)