2021-08-30 21:29:44

by Luis Chamberlain

[permalink] [raw]
Subject: [PATCH v3 1/8] scsi/sd: add error handling support for add_disk()

We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Luis Chamberlain <[email protected]>
---
drivers/scsi/sd.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 610ebba0d66e..8c1273fff23e 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3487,7 +3487,11 @@ static int sd_probe(struct device *dev)
pm_runtime_set_autosuspend_delay(dev,
sdp->host->hostt->rpm_autosuspend_delay);
}
- device_add_disk(dev, gd, NULL);
+
+ error = device_add_disk(dev, gd, NULL);
+ if (error)
+ goto out_free_index;
+
if (sdkp->capacity)
sd_dif_config_host(sdkp);

--
2.30.2


2021-09-06 06:14:08

by Hannes Reinecke

[permalink] [raw]
Subject: Re: [PATCH v3 1/8] scsi/sd: add error handling support for add_disk()

On 8/30/21 11:25 PM, Luis Chamberlain wrote:
> We never checked for errors on add_disk() as this function
> returned void. Now that this is fixed, use the shiny new
> error handling.
>
> Reviewed-by: Christoph Hellwig <[email protected]>
> Signed-off-by: Luis Chamberlain <[email protected]>
> ---
> drivers/scsi/sd.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
Reviewed-by: Hannes Reinecke <[email protected]>

Cheers,

Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
[email protected] +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer

2021-09-07 01:31:27

by Ming Lei

[permalink] [raw]
Subject: Re: [PATCH v3 1/8] scsi/sd: add error handling support for add_disk()

On Mon, Aug 30, 2021 at 02:25:31PM -0700, Luis Chamberlain wrote:
> We never checked for errors on add_disk() as this function
> returned void. Now that this is fixed, use the shiny new
> error handling.
>
> Reviewed-by: Christoph Hellwig <[email protected]>
> Signed-off-by: Luis Chamberlain <[email protected]>
> ---
> drivers/scsi/sd.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index 610ebba0d66e..8c1273fff23e 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -3487,7 +3487,11 @@ static int sd_probe(struct device *dev)
> pm_runtime_set_autosuspend_delay(dev,
> sdp->host->hostt->rpm_autosuspend_delay);
> }
> - device_add_disk(dev, gd, NULL);
> +
> + error = device_add_disk(dev, gd, NULL);
> + if (error)
> + goto out_free_index;
> +

The error handling is actually wrong, see

https://lore.kernel.org/linux-scsi/[email protected]/T/#t

Maybe you can base on that patch.


Thanks,
Ming

2021-09-14 00:45:58

by Luis Chamberlain

[permalink] [raw]
Subject: Re: [PATCH v3 1/8] scsi/sd: add error handling support for add_disk()

On Tue, Sep 07, 2021 at 09:29:07AM +0800, Ming Lei wrote:
> On Mon, Aug 30, 2021 at 02:25:31PM -0700, Luis Chamberlain wrote:
> > We never checked for errors on add_disk() as this function
> > returned void. Now that this is fixed, use the shiny new
> > error handling.
> >
> > Reviewed-by: Christoph Hellwig <[email protected]>
> > Signed-off-by: Luis Chamberlain <[email protected]>
> > ---
> > drivers/scsi/sd.c | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> > index 610ebba0d66e..8c1273fff23e 100644
> > --- a/drivers/scsi/sd.c
> > +++ b/drivers/scsi/sd.c
> > @@ -3487,7 +3487,11 @@ static int sd_probe(struct device *dev)
> > pm_runtime_set_autosuspend_delay(dev,
> > sdp->host->hostt->rpm_autosuspend_delay);
> > }
> > - device_add_disk(dev, gd, NULL);
> > +
> > + error = device_add_disk(dev, gd, NULL);
> > + if (error)
> > + goto out_free_index;
> > +
>
> The error handling is actually wrong, see
>
> https://lore.kernel.org/linux-scsi/[email protected]/T/#t
>
> Maybe you can base on that patch.

Done, thanks!

Luis