From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, hch@lst.de, penguin-kernel@i-love.sakura.ne.jp,
dan.j.williams@intel.com, vishal.l.verma@intel.com,
dave.jiang@intel.com, ira.weiny@intel.com, richard@nod.at,
miquel.raynal@bootlin.com, vigneshr@ti.com, efremov@linux.com,
song@kernel.org, martin.petersen@oracle.com, hare@suse.de,
jack@suse.cz, ming.lei@redhat.com, tj@kernel.org,
mcgrof@kernel.org
Cc: linux-mtd@lists.infradead.org, linux-scsi@vger.kernel.org,
linux-raid@vger.kernel.org, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 08/13] z2ram: add error handling support for add_disk()
Date: Wed, 3 Nov 2021 05:21:52 -0700 [thread overview]
Message-ID: <20211103122157.1215783-9-mcgrof@kernel.org> (raw)
In-Reply-To: <20211103122157.1215783-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. Only the disk is cleaned up inside
z2ram_register_disk() as the caller deals with the rest.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
drivers/block/z2ram.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 4eef218108c6..ccc52c935faf 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -318,6 +318,7 @@ static const struct blk_mq_ops z2_mq_ops = {
static int z2ram_register_disk(int minor)
{
struct gendisk *disk;
+ int err;
disk = blk_mq_alloc_disk(&tag_set, NULL);
if (IS_ERR(disk))
@@ -333,8 +334,10 @@ static int z2ram_register_disk(int minor)
sprintf(disk->disk_name, "z2ram");
z2ram_gendisk[minor] = disk;
- add_disk(disk);
- return 0;
+ err = add_disk(disk);
+ if (err)
+ blk_cleanup_disk(disk);
+ return err;
}
static int __init z2_init(void)
--
2.33.0
next prev parent reply other threads:[~2021-11-03 12:22 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 12:21 [PATCH v2 00/13] block: add_disk() error handling stragglers Luis Chamberlain
2021-11-03 12:21 ` [PATCH v2 01/13] nvdimm/btt: do not call del_gendisk() if not needed Luis Chamberlain
2021-11-03 16:02 ` Christoph Hellwig
2021-11-03 16:58 ` Luis Chamberlain
2021-11-03 12:21 ` [PATCH v2 02/13] nvdimm/btt: use goto error labels on btt_blk_init() Luis Chamberlain
2021-11-03 16:02 ` Christoph Hellwig
2021-11-03 12:21 ` [PATCH v2 03/13] nvdimm/btt: add error handling support for add_disk() Luis Chamberlain
2021-11-03 16:04 ` Christoph Hellwig
2021-11-03 12:21 ` [PATCH v2 04/13] nvdimm/blk: avoid calling del_gendisk() on early failures Luis Chamberlain
2021-11-03 16:05 ` Christoph Hellwig
2021-11-03 16:47 ` Luis Chamberlain
2021-11-03 12:21 ` [PATCH v2 05/13] nvdimm/blk: add error handling support for add_disk() Luis Chamberlain
2021-11-03 16:06 ` Christoph Hellwig
2021-11-03 12:21 ` [PATCH v2 06/13] nvdimm/pmem: cleanup the disk if pmem_release_disk() is yet assigned Luis Chamberlain
2021-11-03 16:06 ` Christoph Hellwig
2021-11-03 12:21 ` [PATCH v2 07/13] nvdimm/pmem: use add_disk() error handling Luis Chamberlain
2021-11-03 16:06 ` Christoph Hellwig
2021-11-03 12:21 ` Luis Chamberlain [this message]
2021-11-03 16:07 ` [PATCH v2 08/13] z2ram: add error handling support for add_disk() Christoph Hellwig
2021-11-03 12:21 ` [PATCH v2 09/13] block/sunvdc: " Luis Chamberlain
2021-11-03 16:07 ` Christoph Hellwig
2021-11-03 12:21 ` [PATCH v2 10/13] mtd/ubi/block: " Luis Chamberlain
2021-11-03 16:07 ` Christoph Hellwig
2021-11-03 12:21 ` [PATCH v2 11/13] ataflop: remove ataflop_probe_lock mutex Luis Chamberlain
2021-11-03 12:21 ` [PATCH v2 12/13] block: make __register_blkdev() return an error Luis Chamberlain
2021-11-03 16:09 ` Christoph Hellwig
2021-11-03 16:44 ` Luis Chamberlain
2021-11-03 17:00 ` Christoph Hellwig
2021-11-03 17:03 ` Luis Chamberlain
2021-11-03 12:21 ` [PATCH v2 13/13] block: add __must_check for *add_disk*() callers Luis Chamberlain
2021-11-03 17:41 ` [PATCH v2 00/13] block: add_disk() error handling stragglers Luis Chamberlain
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=20211103122157.1215783-9-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=axboe@kernel.dk \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=efremov@linux.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=ira.weiny@intel.com \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=miquel.raynal@bootlin.com \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=richard@nod.at \
--cc=song@kernel.org \
--cc=tj@kernel.org \
--cc=vigneshr@ti.com \
--cc=vishal.l.verma@intel.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).