| Message ID | 20210830212538.148729-3-mcgrof@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | block: first batch of add_disk() error handling conversions | expand |
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 <hch@lst.de> > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> > --- > drivers/scsi/sr.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > 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, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
On Tue, Sep 07, 2021 at 09:37:05AM +0800, Ming Lei wrote: > On Mon, Aug 30, 2021 at 02:25:32PM -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 <hch@lst.de> > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> > > --- > > drivers/scsi/sr.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c > > index 2942a4ec9bdd..72fd21844367 100644 > > --- a/drivers/scsi/sr.c > > +++ b/drivers/scsi/sr.c > > @@ -779,7 +779,10 @@ static int sr_probe(struct device *dev) > > dev_set_drvdata(dev, cd); > > disk->flags |= GENHD_FL_REMOVABLE; > > sr_revalidate_disk(cd); > > - device_add_disk(&sdev->sdev_gendev, disk, NULL); > > + > > + error = device_add_disk(&sdev->sdev_gendev, disk, NULL); > > + if (error) > > + goto fail_minor; > > You don't undo register_cdrom(), maybe you can use kref_put(&cd->kref, sr_kref_release); > to simplify the error handling. Works with me, thanks! Luis
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 2942a4ec9bdd..72fd21844367 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -779,7 +779,10 @@ static int sr_probe(struct device *dev) dev_set_drvdata(dev, cd); disk->flags |= GENHD_FL_REMOVABLE; sr_revalidate_disk(cd); - device_add_disk(&sdev->sdev_gendev, disk, NULL); + + error = device_add_disk(&sdev->sdev_gendev, disk, NULL); + if (error) + goto fail_minor; sdev_printk(KERN_DEBUG, sdev, "Attached scsi CD-ROM %s\n", cd->cdi.name);