Re: [PATCH v1 2/4] scsi: sd: unify sd_probe() error cleanup through out_put

[Damien Le Moal <dlemoal@kernel.org>]

On 6/23/26 19:01, Yang Xiuwei wrote:
> After put_device() or device_unregister() has released sdkp through
> scsi_disk_release(), set sdkp to NULL and fall through to out_put so
> put_disk() and kfree() are handled in one place.
> 
> Suggested-by: Ming Lei <tom.leiming@gmail.com>
> Signed-off-by: Yang Xiuwei <yangxiuwei@kylinos.cn>
> ---
>  drivers/scsi/sd.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index d18693d390b2..b096ea237f14 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -4060,8 +4060,8 @@ static int sd_probe(struct scsi_device *sdp)
>  	error = device_add(&sdkp->disk_dev);
>  	if (error) {
>  		put_device(&sdkp->disk_dev);
> -		put_disk(gd);
> -		goto out;
> +		sdkp = NULL;
> +		goto out_put;
>  	}
>  
>  	dev_set_drvdata(dev, sdkp);
> @@ -4090,8 +4090,8 @@ static int sd_probe(struct scsi_device *sdp)
>  		if (sd_large_pool_create()) {
>  			error = -ENOMEM;
>  			device_unregister(&sdkp->disk_dev);
> -			put_disk(gd);
> -			goto out;
> +			sdkp = NULL;
> +			goto out_put;

device_unregister() is called here and in the next error path too. So what about
a "goto out_unregister;" to avoid repeating this pattern ?

>  		}
>  	}
>  
> @@ -4109,11 +4109,11 @@ static int sd_probe(struct scsi_device *sdp)
>  
>  	error = device_add_disk(dev, gd, NULL);
>  	if (error) {
> -		device_unregister(&sdkp->disk_dev);
> -		put_disk(gd);
>  		if (sdp->sector_size > PAGE_SIZE)
>  			sd_large_pool_destroy();
> -		goto out;
> +		device_unregister(&sdkp->disk_dev);
> +		sdkp = NULL;
> +		goto out_put;
>  	}
>  
>  	if (sdkp->security) {


-- 
Damien Le Moal
Western Digital Research