Re: [PATCH v2 2/7] scsi: scsi_debug: Split resp_write_same()

[John Garry <john.garry@linux.dev>]

On 9/24/26 23:54, Bart Van Assche wrote:
> Since the Clang thread-safety analyzer does not support conditional
> locking, split the function resp_write_same() such that all locking
> statements end up in the same branch of an if-statement.
> 
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Reviewed-by: John Garry <john.garry@linux.dev>

> ---
>   drivers/scsi/scsi_debug.c | 34 ++++++++++++++++++++++------------
>   1 file changed, 22 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
> index ed8d69f305f8..d0d2cbac487b 100644
> --- a/drivers/scsi/scsi_debug.c
> +++ b/drivers/scsi/scsi_debug.c
> @@ -5360,8 +5360,8 @@ static int resp_write_scat(struct scsi_cmnd *scp,
>   	return ret;
>   }
>   
> -static int resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num,
> -			   u32 ei_lba, bool unmap, bool ndob)
> +static int __resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num,
> +			     u32 ei_lba, bool unmap, bool ndob)
>   {
>   	struct scsi_device *sdp = scp->device;
>   	struct sdebug_dev_info *devip = (struct sdebug_dev_info *)sdp->hostdata;
> @@ -5373,20 +5373,14 @@ static int resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num,
>   						scp->device->hostdata, true);
>   	u8 *fs1p;
>   	u8 *fsp;
> -	bool meta_data_locked = false;
> -
> -	if (sdebug_dev_is_zoned(devip) || scsi_debug_lbp()) {
> -		sdeb_meta_write_lock(sip);
> -		meta_data_locked = true;
> -	}
>   
>   	ret = check_device_access_params(scp, lba, num, true);
>   	if (ret)
> -		goto out;
> +		return ret;
>   
>   	if (unmap && scsi_debug_lbp()) {
>   		unmap_region(sip, lba, num);
> -		goto out;
> +		return ret;
>   	}
>   	lbaa = lba;
>   	block = do_div(lbaa, sdebug_store_sectors);
> @@ -5422,9 +5416,25 @@ static int resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num,
>   	ret = 0;
>   unlock:
>   	sdeb_data_write_unlock(sip);
> -out:
> -	if (meta_data_locked)
> +	return ret;
> +}
> +
> +static int resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num, u32 ei_lba,
> +			   bool unmap, bool ndob)
> +{
> +	struct scsi_device *sdp = scp->device;
> +	struct sdebug_dev_info *devip = sdp->hostdata;
> +	struct sdeb_store_info *sip = devip2sip(devip, true);
> +	int ret;
> +
> +	if (sdebug_dev_is_zoned(devip) || scsi_debug_lbp()) {
> +		sdeb_meta_write_lock(sip);
> +		ret = __resp_write_same(scp, lba, num, ei_lba, unmap, ndob);
>   		sdeb_meta_write_unlock(sip);
> +	} else {
> +		ret = __resp_write_same(scp, lba, num, ei_lba, unmap, ndob);
> +	}
> +
>   	return ret;
>   }
>