From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, efremov@linux.com, hch@lst.de
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v2 06/14] amiflop: add error handling support for add_disk()
Date: Mon, 27 Sep 2021 15:02:54 -0700 [thread overview]
Message-ID: <20210927220302.1073499-7-mcgrof@kernel.org> (raw)
In-Reply-To: <20210927220302.1073499-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. The caller for fd_alloc_disk() deals with
the rest of the cleanup like the tag.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
drivers/block/amiflop.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 8b1714021498..7da6a7532cde 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1780,6 +1780,7 @@ static const struct blk_mq_ops amiflop_mq_ops = {
static int fd_alloc_disk(int drive, int system)
{
struct gendisk *disk;
+ int err;
disk = blk_mq_alloc_disk(&unit[drive].tag_set, NULL);
if (IS_ERR(disk))
@@ -1798,8 +1799,10 @@ static int fd_alloc_disk(int drive, int system)
set_capacity(disk, 880 * 2);
unit[drive].gendisk[system] = disk;
- add_disk(disk);
- return 0;
+ err = add_disk(disk);
+ if (err)
+ blk_cleanup_disk(disk);
+ return err;
}
static int fd_alloc_drive(int drive)
--
2.30.2
next prev parent reply other threads:[~2021-09-27 22:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 22:02 [PATCH v2 00/14] block: 6th batch of add_disk() error handling conversions Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 01/14] block/swim3: add error handling support for add_disk() Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 02/14] floppy: fix add_disk() assumption on exit due to new developments Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 03/14] floppy: use blk_cleanup_disk() Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 04/14] floppy: fix calling platform_device_unregister() on invalid drives Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 05/14] floppy: add error handling support for add_disk() Luis Chamberlain
2021-09-27 22:02 ` Luis Chamberlain [this message]
2021-09-27 22:02 ` [PATCH v2 07/14] swim: simplify using blk_cleanup_disk() on swim_remove() Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 08/14] swim: add helper for disk cleanup Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 09/14] swim: add a floppy registration bool which triggers del_gendisk() Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 10/14] swim: add error handling support for add_disk() Luis Chamberlain
2021-09-27 22:02 ` [PATCH v2 11/14] block/ataflop: use the blk_cleanup_disk() helper Luis Chamberlain
2021-09-27 22:03 ` [PATCH v2 12/14] block/ataflop: add registration bool before calling del_gendisk() Luis Chamberlain
2021-09-27 22:03 ` [PATCH v2 13/14] block/ataflop: provide a helper for cleanup up an atari disk Luis Chamberlain
2021-09-27 22:03 ` [PATCH v2 14/14] block/ataflop: add error handling support for add_disk() Luis Chamberlain
2021-09-27 22:32 ` [PATCH v2 00/14] block: 6th 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=20210927220302.1073499-7-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=axboe@kernel.dk \
--cc=efremov@linux.com \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.