2022-12-13 14:33:59

by John Garry

Subject: [PATCH] scsi: scsi_debug: Delete unreachable code in inquiry_vpd_b0()

The 2nd return statement in inquiry_vpd_b0() is unreachable, so delete it.

Signed-off-by: John Garry <[email protected]>

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index b8a76b89f85a..6f637501539c 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -1511,8 +1511,6 @@ static int inquiry_vpd_b0(unsigned char *arr)
put_unaligned_be64(sdebug_write_same_length, &arr[32]);

return 0x3c; /* Mandatory page length for Logical Block Provisioning */
-
- return sizeof(vpdb0_data);
}

/* Block device characteristics VPD page (SBC-3) */
--
2.35.3

2022-12-14 01:38:46

by Jason Yan

Subject: Re: [PATCH] scsi: scsi_debug: Delete unreachable code in inquiry_vpd_b0()

On 2022/12/13 22:21, John Garry wrote:
> The 2nd return statement in inquiry_vpd_b0() is unreachable, so delete it.
>
> Signed-off-by: John Garry <[email protected]>
>
> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
> index b8a76b89f85a..6f637501539c 100644
> --- a/drivers/scsi/scsi_debug.c
> +++ b/drivers/scsi/scsi_debug.c
> @@ -1511,8 +1511,6 @@ static int inquiry_vpd_b0(unsigned char *arr)
> put_unaligned_be64(sdebug_write_same_length, &arr[32]);
>
> return 0x3c; /* Mandatory page length for Logical Block Provisioning */
> -
> - return sizeof(vpdb0_data);
> }
>
> /* Block device characteristics VPD page (SBC-3) */
>

Looks good,
Reviewed-by: Jason Yan <[email protected]>

2022-12-14 03:37:35

by Martin K. Petersen

Subject: Re: [PATCH] scsi: scsi_debug: Delete unreachable code in inquiry_vpd_b0()

John,

> The 2nd return statement in inquiry_vpd_b0() is unreachable, so delete it.

Applied to 6.2/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering