Re: [PATCH v4 7/9] scsi: Simplify nested if conditional in scsi_probe_lun()

[Hannes Reinecke <hare@suse.de>]

On 10/2/25 21:25, Ewan D. Milne wrote:
> Make code congruent with similar code in read_capacity_16()/read_capacity_10().
> 
> Signed-off-by: Ewan D. Milne <emilne@redhat.com>
> ---
>   drivers/scsi/scsi_scan.c | 18 ++++++++----------
>   1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
> index c754b1d566e0..348ecfe5cdb0 100644
> --- a/drivers/scsi/scsi_scan.c
> +++ b/drivers/scsi/scsi_scan.c
> @@ -717,16 +717,14 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
>   				"scsi scan: INQUIRY %s with code 0x%x\n",
>   				result ? "failed" : "successful", result));
>   
> -		if (result == 0) {
> -			/*
> -			 * if nothing was transferred, we try
> -			 * again. It's a workaround for some USB
> -			 * devices.
> -			 */
> -			if (resid == try_inquiry_len)
> -				continue;
> -		}
> -		break;
> +		if (result || resid != try_inquiry_len)
> +			break;
> +
> +		/*
> +		 * If the status was good but nothing was transferred,
> +		 * we retry. It is a workaround for some buggy devices
> +		 * or SAT which sometimes do not return any data.
> +		 */
>   	}
>   
>   	if (result == 0) {

Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                  Kernel Storage Architect
hare@suse.de                                +49 911 74053 688
SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg
HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich