Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <baijiaju1990@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

+15 -20
+15 -20
fs/nfsd/nfs4callback.c
··· 512 512 if (unlikely(status)) 513 513 return status; 514 514 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; 520 518 521 519 return decode_cb_op_status(xdr, OP_CB_RECALL, &cb->cb_status); 522 520 } ··· 602 604 if (unlikely(status)) 603 605 return status; 604 606 605 - if (cb) { 606 - status = decode_cb_sequence4res(xdr, cb); 607 - if (unlikely(status || cb->cb_seq_status)) 608 - return status; 609 - } 607 + status = decode_cb_sequence4res(xdr, cb); 608 + if (unlikely(status || cb->cb_seq_status)) 609 + return status; 610 + 610 611 return decode_cb_op_status(xdr, OP_CB_LAYOUTRECALL, &cb->cb_status); 611 612 } 612 613 #endif /* CONFIG_NFSD_PNFS */ ··· 660 663 if (unlikely(status)) 661 664 return status; 662 665 663 - if (cb) { 664 - status = decode_cb_sequence4res(xdr, cb); 665 - if (unlikely(status || cb->cb_seq_status)) 666 - return status; 667 - } 666 + status = decode_cb_sequence4res(xdr, cb); 667 + if (unlikely(status || cb->cb_seq_status)) 668 + return status; 669 + 668 670 return decode_cb_op_status(xdr, OP_CB_NOTIFY_LOCK, &cb->cb_status); 669 671 } 670 672 ··· 755 759 if (unlikely(status)) 756 760 return status; 757 761 758 - if (cb) { 759 - status = decode_cb_sequence4res(xdr, cb); 760 - if (unlikely(status || cb->cb_seq_status)) 761 - return status; 762 - } 762 + status = decode_cb_sequence4res(xdr, cb); 763 + if (unlikely(status || cb->cb_seq_status)) 764 + return status; 765 + 763 766 return decode_cb_op_status(xdr, OP_CB_OFFLOAD, &cb->cb_status); 764 767 } 765 768 /*