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-block@vger•kernel.org, linuxppc-dev@lists•ozlabs.org,
Luis Chamberlain <mcgrof@kernel•org>,
linux-mtd@lists•infradead.org, linux-kernel@vger•kernel.org
Subject: [PATCH v2 07/10] block/sunvdc: add error handling support for add_disk()
Date: Mon, 27 Sep 2021 15:01:54 -0700 [thread overview]
Message-ID: <20210927220157.1069658-8-mcgrof@kernel.org> (raw)
In-Reply-To: <20210927220157.1069658-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.
We re-use the same free tag call, so we also add a label for
that as well.
Signed-off-by: Luis Chamberlain <mcgrof@kernel•org>
---
drivers/block/sunvdc.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 4d4bb810c2ae..6f45a53f7cbf 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -826,8 +826,8 @@ static int probe_disk(struct vdc_port *port)
if (IS_ERR(g)) {
printk(KERN_ERR PFX "%s: Could not allocate gendisk.\n",
port->vio.name);
- blk_mq_free_tag_set(&port->tag_set);
- return PTR_ERR(g);
+ err = PTR_ERR(g);
+ goto out_free_tag;
}
port->disk = g;
@@ -879,9 +879,17 @@ static int probe_disk(struct vdc_port *port)
port->vdisk_size, (port->vdisk_size >> (20 - 9)),
port->vio.ver.major, port->vio.ver.minor);
- device_add_disk(&port->vio.vdev->dev, g, NULL);
+ err = device_add_disk(&port->vio.vdev->dev, g, NULL);
+ if (err)
+ goto out_cleanup_disk;
return 0;
+
+out_cleanup_disk:
+ blk_cleanup_disk(g);
+out_free_tag:
+ blk_mq_free_tag_set(&port->tag_set);
+ return err;
}
static struct ldc_channel_config vdc_ldc_cfg = {
--
2.30.2
next prev parent reply other threads:[~2021-09-27 22:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 22:01 [PATCH v2 00/10] block: fourth batch of add_disk() error handling conversions Luis Chamberlain
2021-09-27 22:01 ` [PATCH v2 01/10] mtip32xx: add error handling support for add_disk() Luis Chamberlain
2021-09-27 22:01 ` [PATCH v2 02/10] pktcdvd: " Luis Chamberlain
2021-09-27 22:01 ` [PATCH v2 03/10] ps3disk: " Luis Chamberlain
2021-09-27 22:01 ` [PATCH v2 04/10] ps3vram: " Luis Chamberlain
2021-09-27 22:01 ` [PATCH v2 05/10] rnbd: " Luis Chamberlain
2021-09-27 22:01 ` [PATCH v2 06/10] block/rsxx: " Luis Chamberlain
2021-09-27 22:01 ` Luis Chamberlain [this message]
2021-09-27 22:01 ` [PATCH v2 08/10] block/sx8: " Luis Chamberlain
2021-09-27 22:01 ` [PATCH v2 09/10] pf: " Luis Chamberlain
2021-09-27 22:01 ` [PATCH v2 10/10] mtd/ubi/block: " Luis Chamberlain
2021-09-27 22:31 ` [PATCH v2 00/10] block: fourth batch of add_disk() error handling conversions 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=20210927220157.1069658-8-mcgrof@kernel.org \
--to=mcgrof@kernel$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=benh@kernel$(echo .)crashing.org \
--cc=bhelgaas@google$(echo .)com \
--cc=geoff@infradead$(echo .)org \
--cc=haris.iqbal@ionos$(echo .)com \
--cc=jim@jtan$(echo .)com \
--cc=jinpu.wang@ionos$(echo .)com \
--cc=josh.h.morris@us$(echo .)ibm.com \
--cc=lee.jones@linaro$(echo .)org \
--cc=linux-block@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mtd@lists$(echo .)infradead.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=liushixin2@huawei$(echo .)com \
--cc=miquel.raynal@bootlin$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=paulus@samba$(echo .)org \
--cc=pjk1939@linux$(echo .)ibm.com \
--cc=richard@nod$(echo .)at \
--cc=thunder.leizhen@huawei$(echo .)com \
--cc=tim@cyberelk$(echo .)net \
--cc=vigneshr@ti$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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