From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, jejb@linux.ibm.com, martin.petersen@oracle.com,
agk@redhat.com, snitzer@redhat.com, colyli@suse.de,
kent.overstreet@gmail.com, boris.ostrovsky@oracle.com,
jgross@suse.com, sstabellini@kernel.org, roger.pau@citrix.com,
geert@linux-m68k.org, ulf.hansson@linaro.org, tj@kernel.org,
hare@suse.de, jdike@addtoit.com, richard@nod.at,
anton.ivanov@cambridgegreys.com, johannes.berg@intel.com,
krisman@collabora.com, chris.obbard@collabora.com,
thehajime@gmail.com, zhuyifei1999@gmail.com,
haris.iqbal@ionos.com, jinpu.wang@ionos.com,
miquel.raynal@bootlin.com, vigneshr@ti.com,
linux-mtd@lists.infradead.org
Cc: linux-scsi@vger.kernel.org, dm-devel@redhat.com,
linux-bcache@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-m68k@lists.linux-m68k.org, linux-um@lists.infradead.org,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 7/9] um/drivers/ubd_kern: add error handling support for add_disk()
Date: Fri, 15 Oct 2021 16:30:26 -0700 [thread overview]
Message-ID: <20211015233028.2167651-8-mcgrof@kernel.org> (raw)
In-Reply-To: <20211015233028.2167651-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.
ubd_disk_register() never returned an error, so just fix
that now and let the caller handle the error condition.
Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
arch/um/drivers/ubd_kern.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index fefd343412c7..69d2d0049a61 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -855,8 +855,8 @@ static const struct attribute_group *ubd_attr_groups[] = {
NULL,
};
-static void ubd_disk_register(int major, u64 size, int unit,
- struct gendisk *disk)
+static int ubd_disk_register(int major, u64 size, int unit,
+ struct gendisk *disk)
{
disk->major = major;
disk->first_minor = unit << UBD_SHIFT;
@@ -873,7 +873,7 @@ static void ubd_disk_register(int major, u64 size, int unit,
disk->private_data = &ubd_devs[unit];
disk->queue = ubd_devs[unit].queue;
- device_add_disk(&ubd_devs[unit].pdev.dev, disk, ubd_attr_groups);
+ return device_add_disk(&ubd_devs[unit].pdev.dev, disk, ubd_attr_groups);
}
#define ROUND_BLOCK(n) ((n + (SECTOR_SIZE - 1)) & (-SECTOR_SIZE))
@@ -920,10 +920,15 @@ static int ubd_add(int n, char **error_out)
blk_queue_write_cache(ubd_dev->queue, true, false);
blk_queue_max_segments(ubd_dev->queue, MAX_SG);
blk_queue_segment_boundary(ubd_dev->queue, PAGE_SIZE - 1);
- ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, disk);
+ err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, disk);
+ if (err)
+ goto out_cleanup_disk;
+
ubd_gendisk[n] = disk;
return 0;
+out_cleanup_disk:
+ blk_cleanup_disk(disk);
out_cleanup_tags:
blk_mq_free_tag_set(&ubd_dev->tag_set);
out:
--
2.30.2
next prev parent reply other threads:[~2021-10-15 23:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 23:30 [PATCH 0/9] block: reviewed add_disk() error handling set Luis Chamberlain
2021-10-15 23:30 ` [PATCH 1/9] scsi/sd: add error handling support for add_disk() Luis Chamberlain
2021-10-17 2:51 ` Martin K. Petersen
2021-10-18 20:31 ` Luis Chamberlain
2021-10-19 2:52 ` Martin K. Petersen
2021-10-15 23:30 ` [PATCH 2/9] scsi/sr: " Luis Chamberlain
2021-10-17 2:53 ` Martin K. Petersen
2021-10-15 23:30 ` [PATCH 3/9] dm: add add_disk() error handling Luis Chamberlain
2021-10-15 23:30 ` [PATCH 4/9] bcache: add error handling support for add_disk() Luis Chamberlain
2021-10-15 23:30 ` [PATCH 5/9] xen-blkfront: " Luis Chamberlain
2021-10-15 23:30 ` [PATCH 6/9] m68k/emu/nfblock: " Luis Chamberlain
2021-10-15 23:30 ` Luis Chamberlain [this message]
2021-10-15 23:30 ` [PATCH 8/9] rnbd: " Luis Chamberlain
2021-10-15 23:30 ` [PATCH 9/9] mtd: add add_disk() error handling Luis Chamberlain
2021-10-21 3:42 ` [PATCH 0/9] block: reviewed add_disk() error handling set Martin K. Petersen
2021-10-21 15:01 ` (subset) " Jens Axboe
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=20211015233028.2167651-8-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=agk@redhat.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=axboe@kernel.dk \
--cc=boris.ostrovsky@oracle.com \
--cc=chris.obbard@collabora.com \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=geert@linux-m68k.org \
--cc=hare@suse.de \
--cc=haris.iqbal@ionos.com \
--cc=jdike@addtoit.com \
--cc=jejb@linux.ibm.com \
--cc=jgross@suse.com \
--cc=jinpu.wang@ionos.com \
--cc=johannes.berg@intel.com \
--cc=kent.overstreet@gmail.com \
--cc=krisman@collabora.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=martin.petersen@oracle.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=roger.pau@citrix.com \
--cc=snitzer@redhat.com \
--cc=sstabellini@kernel.org \
--cc=thehajime@gmail.com \
--cc=tj@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=vigneshr@ti.com \
--cc=xen-devel@lists.xenproject.org \
--cc=zhuyifei1999@gmail.com \
/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).