Skip to content

Commit 10fa8ac

Browse files
author
J. Bruce Fields
committed
nfsd: Remove unnecessary NULL checks
"cb" is never actually NULL in these functions. On a quick skim of the history, they seem to have been there from the beginning. I'm not sure if they originally served a purpose. Reported-by: Jia-Ju Bai <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
1 parent 4f37548 commit 10fa8ac

File tree

1 file changed

+15
-20
lines changed

1 file changed

+15
-20
lines changed

fs/nfsd/nfs4callback.c

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -512,11 +512,9 @@ static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp,
512512
if (unlikely(status))
513513
return status;
514514

515-
if (cb != NULL) {
516-
status = decode_cb_sequence4res(xdr, cb);
517-
if (unlikely(status || cb->cb_seq_status))
518-
return status;
519-
}
515+
status = decode_cb_sequence4res(xdr, cb);
516+
if (unlikely(status || cb->cb_seq_status))
517+
return status;
520518

521519
return decode_cb_op_status(xdr, OP_CB_RECALL, &cb->cb_status);
522520
}
@@ -604,11 +602,10 @@ static int nfs4_xdr_dec_cb_layout(struct rpc_rqst *rqstp,
604602
if (unlikely(status))
605603
return status;
606604

607-
if (cb) {
608-
status = decode_cb_sequence4res(xdr, cb);
609-
if (unlikely(status || cb->cb_seq_status))
610-
return status;
611-
}
605+
status = decode_cb_sequence4res(xdr, cb);
606+
if (unlikely(status || cb->cb_seq_status))
607+
return status;
608+
612609
return decode_cb_op_status(xdr, OP_CB_LAYOUTRECALL, &cb->cb_status);
613610
}
614611
#endif /* CONFIG_NFSD_PNFS */
@@ -663,11 +660,10 @@ static int nfs4_xdr_dec_cb_notify_lock(struct rpc_rqst *rqstp,
663660
if (unlikely(status))
664661
return status;
665662

666-
if (cb) {
667-
status = decode_cb_sequence4res(xdr, cb);
668-
if (unlikely(status || cb->cb_seq_status))
669-
return status;
670-
}
663+
status = decode_cb_sequence4res(xdr, cb);
664+
if (unlikely(status || cb->cb_seq_status))
665+
return status;
666+
671667
return decode_cb_op_status(xdr, OP_CB_NOTIFY_LOCK, &cb->cb_status);
672668
}
673669

@@ -759,11 +755,10 @@ static int nfs4_xdr_dec_cb_offload(struct rpc_rqst *rqstp,
759755
if (unlikely(status))
760756
return status;
761757

762-
if (cb) {
763-
status = decode_cb_sequence4res(xdr, cb);
764-
if (unlikely(status || cb->cb_seq_status))
765-
return status;
766-
}
758+
status = decode_cb_sequence4res(xdr, cb);
759+
if (unlikely(status || cb->cb_seq_status))
760+
return status;
761+
767762
return decode_cb_op_status(xdr, OP_CB_OFFLOAD, &cb->cb_status);
768763
}
769764
/*

0 commit comments

Comments
 (0)