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: linux-block@vger.kernel.org, bvanassche@acm.org,
linux-scsi@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
ming.lei@redhat.com, hch@infradead.org, dm-devel@redhat.com,
nbd@other.debian.org, Christoph Hellwig <hch@lst.de>,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [dm-devel] [PATCH v2 6/6] nbd: add error handling support for add_disk()
Date: Fri, 27 Aug 2021 12:05:04 -0700 [thread overview]
Message-ID: <20210827190504.3103362-7-mcgrof@kernel.org> (raw)
In-Reply-To: <20210827190504.3103362-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/block/nbd.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 5170a630778d..741365295157 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1757,7 +1757,9 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
disk->fops = &nbd_fops;
disk->private_data = nbd;
sprintf(disk->disk_name, "nbd%d", index);
- add_disk(disk);
+ err = add_disk(disk);
+ if (err)
+ goto out_err_disk;
/*
* Now publish the device.
@@ -1766,6 +1768,8 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
nbd_total_devices++;
return nbd;
+out_err_disk:
+ blk_cleanup_disk(disk);
out_free_idr:
mutex_lock(&nbd_index_mutex);
idr_remove(&nbd_index_idr, index);
--
2.30.2
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
prev parent reply other threads:[~2021-08-27 19:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-27 19:04 [dm-devel] [PATCH v2 0/6] block: first batch of add_disk() error handling conversions Luis Chamberlain
2021-08-27 19:04 ` [dm-devel] [PATCH v2 1/6] scsi/sd: add error handling support for add_disk() Luis Chamberlain
2021-08-27 19:05 ` [dm-devel] [PATCH v2 2/6] scsi/sr: " Luis Chamberlain
2021-08-27 19:05 ` [dm-devel] [PATCH v2 3/6] nvme: " Luis Chamberlain
2021-08-28 7:11 ` Christoph Hellwig
2021-08-27 19:05 ` [dm-devel] [PATCH v2 4/6] md: " Luis Chamberlain
2021-08-27 19:05 ` [dm-devel] [PATCH v2 5/6] loop: " Luis Chamberlain
2021-08-27 19:05 ` Luis Chamberlain [this message]
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=20210827190504.3103362-7-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=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).