2020-11-18 13:40:51

by Colin King

[permalink] [raw]
Subject: [PATCH][next] scsi: lpfc: remove dead code on second !ndlp check

From: Colin Ian King <[email protected]>

Currently there is a null check on the pointer ndlp that exits via
error path issue_ct_rsp_exit followed by another null check on the
same pointer that is almost identical to the previous null check
stanza and yet can never can be reached because the previous check
exited via issue_ct_rsp_exit. This is deadcode and can be removed.

Addresses-Coverity: ("Logically dead code")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/scsi/lpfc/lpfc_bsg.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 35f4998504c1..41e3657c2d8d 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1526,12 +1526,6 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct bsg_job *job, uint32_t tag,
goto issue_ct_rsp_exit;
}

- /* Check if the ndlp is active */
- if (!ndlp) {
- rc = IOCB_ERROR;
- goto issue_ct_rsp_exit;
- }
-
/* get a refernece count so the ndlp doesn't go away while
* we respond
*/
--
2.28.0


2020-11-19 21:00:48

by James Smart

[permalink] [raw]
Subject: Re: [PATCH][next] scsi: lpfc: remove dead code on second !ndlp check



On 11/18/2020 5:37 AM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Currently there is a null check on the pointer ndlp that exits via
> error path issue_ct_rsp_exit followed by another null check on the
> same pointer that is almost identical to the previous null check
> stanza and yet can never can be reached because the previous check
> exited via issue_ct_rsp_exit. This is deadcode and can be removed.
>
> Addresses-Coverity: ("Logically dead code")
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_bsg.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
> index 35f4998504c1..41e3657c2d8d 100644
> --- a/drivers/scsi/lpfc/lpfc_bsg.c
> +++ b/drivers/scsi/lpfc/lpfc_bsg.c
> @@ -1526,12 +1526,6 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct bsg_job *job, uint32_t tag,
> goto issue_ct_rsp_exit;
> }
>
> - /* Check if the ndlp is active */
> - if (!ndlp) {
> - rc = IOCB_ERROR;
> - goto issue_ct_rsp_exit;
> - }
> -
> /* get a refernece count so the ndlp doesn't go away while
> * we respond
> */
Looks good.

Reviewed-by: James Smart <[email protected]>

-- james


Attachments:
smime.p7s (4.07 kB)
S/MIME Cryptographic Signature

2020-11-20 03:23:01

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH][next] scsi: lpfc: remove dead code on second !ndlp check


Colin,

> Currently there is a null check on the pointer ndlp that exits via
> error path issue_ct_rsp_exit followed by another null check on the
> same pointer that is almost identical to the previous null check
> stanza and yet can never can be reached because the previous check
> exited via issue_ct_rsp_exit. This is deadcode and can be removed.

Applied to 5.11/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2020-11-24 04:00:06

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH][next] scsi: lpfc: remove dead code on second !ndlp check

On Wed, 18 Nov 2020 13:37:44 +0000, Colin King wrote:

> Currently there is a null check on the pointer ndlp that exits via
> error path issue_ct_rsp_exit followed by another null check on the
> same pointer that is almost identical to the previous null check
> stanza and yet can never can be reached because the previous check
> exited via issue_ct_rsp_exit. This is deadcode and can be removed.

Applied to 5.11/scsi-queue, thanks!

[1/1] scsi: lpfc: Remove dead code on second !ndlp check
https://git.kernel.org/mkp/scsi/c/61795a5316ad

--
Martin K. Petersen Oracle Linux Engineering