From: Luis Chamberlain <mcgrof@kernel.org>
To: 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
Cc: hch@infradead.org, hare@suse.de, bvanassche@acm.org,
ming.lei@redhat.com, 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,
Luis Chamberlain <mcgrof@kernel.org>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH v3 2/8] scsi/sr: add error handling support for add_disk()
Date: Mon, 30 Aug 2021 14:25:32 -0700 [thread overview]
Message-ID: <20210830212538.148729-3-mcgrof@kernel.org> (raw)
In-Reply-To: <20210830212538.148729-1-mcgrof@kernel.org>
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;
sdev_printk(KERN_DEBUG, sdev,
"Attached scsi CD-ROM %s\n", cd->cdi.name);
--
2.30.2
next prev parent reply other threads:[~2021-08-30 21:26 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 21:25 [PATCH v3 0/8] block: first batch of add_disk() error handling conversions Luis Chamberlain
2021-08-30 21:25 ` [PATCH v3 1/8] scsi/sd: add error handling support for add_disk() Luis Chamberlain
2021-09-06 6:13 ` Hannes Reinecke
2021-09-07 1:29 ` Ming Lei
2021-09-13 17:21 ` Luis Chamberlain
2021-08-30 21:25 ` Luis Chamberlain [this message]
2021-09-06 6:13 ` [PATCH v3 2/8] scsi/sr: " Hannes Reinecke
2021-09-07 1:37 ` Ming Lei
2021-09-13 17:26 ` Luis Chamberlain
2021-08-30 21:25 ` [PATCH v3 3/8] nvme: " Luis Chamberlain
2021-09-06 6:16 ` Hannes Reinecke
2021-09-06 8:09 ` Christoph Hellwig
2021-09-06 8:09 ` Christoph Hellwig
2021-08-30 21:25 ` [PATCH v3 4/8] mmc/core/block: " Luis Chamberlain
2021-09-06 17:10 ` Ulf Hansson
2021-08-30 21:25 ` [PATCH v3 5/8] md: " Luis Chamberlain
2021-09-06 6:17 ` Hannes Reinecke
2021-08-30 21:25 ` [PATCH v3 6/8] dm: add add_disk() error handling Luis Chamberlain
2021-09-06 6:19 ` Hannes Reinecke
2021-08-30 21:25 ` [PATCH v3 7/8] loop: add error handling support for add_disk() Luis Chamberlain
2021-09-06 6:19 ` Hannes Reinecke
2021-08-30 21:25 ` [PATCH v3 8/8] nbd: " Luis Chamberlain
2021-09-06 6:20 ` Hannes Reinecke
2021-09-01 4:19 ` [PATCH v3 0/8] block: first batch of add_disk() error handling conversions Tetsuo Handa
2021-09-01 5:30 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210830212538.148729-3-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=agk@redhat.com \
--cc=avri.altman@wdc.com \
--cc=axboe@kernel.dk \
--cc=beanhuo@micron.com \
--cc=bvanassche@acm.org \
--cc=dm-devel@redhat.com \
--cc=hare@suse.de \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=josef@toxicpanda.com \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=nbd@other.debian.org \
--cc=sagi@grimberg.me \
--cc=snitzer@redhat.com \
--cc=swboyd@chromium.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).