Re: [PATCH v3 2/8] scsi/sr: add error handling support for add_disk()
- To: Luis Chamberlain <mcgrof@kernel.org>
- Cc: axboe@kernel.dk, martin.petersen@oracle.com, jejb@linux.ibm.com, kbusch@kernel.org, sagi@grimberg.me, adrian.hunter@intel.com, beanhuo@micron.com, ulf.hansson@linaro.org, avri.altman@wdc.com, swboyd@chromium.org, agk@redhat.com, snitzer@redhat.com, josef@toxicpanda.com, hch@infradead.org, hare@suse.de, bvanassche@acm.org, linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org, linux-mmc@vger.kernel.org, dm-devel@redhat.com, nbd@other.debian.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>
- Subject: Re: [PATCH v3 2/8] scsi/sr: add error handling support for add_disk()
- From: Ming Lei <ming.lei@redhat.com>
- Date: Tue, 7 Sep 2021 09:37:05 +0800
- Message-id: <[🔎] YTbCQdieHG07Bz8W@T590>
- In-reply-to: <20210830212538.148729-3-mcgrof@kernel.org>
- References: <20210830212538.148729-1-mcgrof@kernel.org> <20210830212538.148729-3-mcgrof@kernel.org>
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.
Thanks,
Ming
Reply to: