From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, bhelgaas@google.com, liushixin2@huawei.com,
thunder.leizhen@huawei.com, lee.jones@linaro.org,
geoff@infradead.org, mpe@ellerman.id.au,
benh@kernel.crashing.org, paulus@samba.org, jim@jtan.com,
haris.iqbal@ionos.com, jinpu.wang@ionos.com,
josh.h.morris@us.ibm.com, pjk1939@linux.ibm.com,
tim@cyberelk.net, richard@nod.at, miquel.raynal@bootlin.com,
vigneshr@ti.com
Cc: linux-mtd@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 03/10] ps3disk: add error handling support for add_disk()
Date: Wed, 1 Sep 2021 14:00:21 -0700 [thread overview]
Message-ID: <20210901210028.1750956-4-mcgrof@kernel.org> (raw)
In-Reply-To: <20210901210028.1750956-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.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
drivers/block/ps3disk.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 8d51efbe045d..3054adf77460 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -467,9 +467,13 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev)
gendisk->disk_name, priv->model, priv->raw_capacity >> 11,
get_capacity(gendisk) >> 11);
- device_add_disk(&dev->sbd.core, gendisk, NULL);
- return 0;
+ error = device_add_disk(&dev->sbd.core, gendisk, NULL);
+ if (error)
+ goto fail_cleanup_disk;
+ return 0;
+fail_cleanup_disk:
+ blk_cleanup_disk(gendisk);
fail_free_tag_set:
blk_mq_free_tag_set(&priv->tag_set);
fail_teardown:
--
2.30.2
next prev parent reply other threads:[~2021-09-01 21:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 21:00 [PATCH 00/10] block: fourth batch of add_disk() error handling conversions Luis Chamberlain
2021-09-01 21:00 ` [PATCH 01/10] mtip32xx: add error handling support for add_disk() Luis Chamberlain
2021-09-01 21:00 ` [PATCH 02/10] pktcdvd: " Luis Chamberlain
2021-09-01 21:00 ` Luis Chamberlain [this message]
2021-09-01 21:00 ` [PATCH 04/10] ps3vram: " Luis Chamberlain
2021-09-01 21:00 ` [PATCH 05/10] rnbd: " Luis Chamberlain
2021-09-02 5:32 ` Jinpu Wang
2021-09-01 21:00 ` [PATCH 06/10] block/rsxx: " Luis Chamberlain
2021-09-01 21:00 ` [PATCH 07/10] block/sunvdc: " Luis Chamberlain
2021-09-01 21:00 ` [PATCH 08/10] block/sx8: " Luis Chamberlain
2021-09-01 21:00 ` [PATCH 09/10] pf: " Luis Chamberlain
2021-09-01 21:00 ` [PATCH 10/10] mtd/ubi/block: " 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=20210901210028.1750956-4-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=axboe@kernel.dk \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=geoff@infradead.org \
--cc=haris.iqbal@ionos.com \
--cc=jim@jtan.com \
--cc=jinpu.wang@ionos.com \
--cc=josh.h.morris@us.ibm.com \
--cc=lee.jones@linaro.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=liushixin2@huawei.com \
--cc=miquel.raynal@bootlin.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=pjk1939@linux.ibm.com \
--cc=richard@nod.at \
--cc=thunder.leizhen@huawei.com \
--cc=tim@cyberelk.net \
--cc=vigneshr@ti.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).