2017-09-07 13:51:41

by Colin King

Subject: [PATCH] csi: libcxgbi: remove redundant check and close on csk

From: Colin Ian King <[email protected]>

csk is always null on the error return path and so the non-null
check and call to cxgbi_sock_closed on csk is redundant and
can be removed.

Detected by: CoverityScan CID#114329 ("Logically dead code")

Signed-off-by: Colin Ian King <[email protected]>
---
drivers/scsi/cxgbi/libcxgbi.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index 512c8f1ea5b0..da36c2de069e 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -688,8 +688,6 @@ cxgbi_check_route(struct sockaddr *dst_addr, int ifindex)

rel_rt:
ip_rt_put(rt);
- if (csk)
- cxgbi_sock_closed(csk);
err_out:
return ERR_PTR(err);
}
--
2.14.1

2017-09-11 09:22:10

by Varun Prakash

Subject: Re: [PATCH] csi: libcxgbi: remove redundant check and close on csk

On Thu, Sep 07, 2017 at 02:51:33PM +0100, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> csk is always null on the error return path and so the non-null
> check and call to cxgbi_sock_closed on csk is redundant and
> can be removed.
>
> Detected by: CoverityScan CID#114329 ("Logically dead code")
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/scsi/cxgbi/libcxgbi.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
> index 512c8f1ea5b0..da36c2de069e 100644
> --- a/drivers/scsi/cxgbi/libcxgbi.c
> +++ b/drivers/scsi/cxgbi/libcxgbi.c
> @@ -688,8 +688,6 @@ cxgbi_check_route(struct sockaddr *dst_addr, int ifindex)
>
> rel_rt:
> ip_rt_put(rt);
> - if (csk)
> - cxgbi_sock_closed(csk);
> err_out:
> return ERR_PTR(err);
> }

Acked-by: Varun Prakash <[email protected]>

2017-09-16 01:45:27

by Martin K. Petersen

Subject: Re: [PATCH] csi: libcxgbi: remove redundant check and close on csk

Colin,

> csk is always null on the error return path and so the non-null check
> and call to cxgbi_sock_closed on csk is redundant and can be removed.

Applied to 4.15/scsi-queue.

--
Martin K. Petersen Oracle Linux Engineering