All of lore.kernel.org
 help / color / mirror / Atom feed
From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, geoff@infradead.org, mpe@ellerman.id.au,
	benh@kernel.crashing.org, paulus@samba.org, jim@jtan.com,
	minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org,
	richard@nod.at, miquel.raynal@bootlin.com, vigneshr@ti.com,
	dan.j.williams@intel.com, vishal.l.verma@intel.com,
	dave.jiang@intel.com, ira.weiny@intel.com, kbusch@kernel.org,
	hch@lst.de, sagi@grimberg.me
Cc: linux-block@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-mtd@lists.infradead.org, nvdimm@lists.linux.dev,
	linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
	Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 09/13] z2ram: add error handling support for add_disk()
Date: Fri, 15 Oct 2021 16:52:15 -0700	[thread overview]
Message-ID: <20211015235219.2191207-10-mcgrof@kernel.org> (raw)
In-Reply-To: <20211015235219.2191207-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.30.2


WARNING: multiple messages have this Message-ID (diff)
From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, geoff@infradead.org, mpe@ellerman.id.au,
	benh@kernel.crashing.org, paulus@samba.org, jim@jtan.com,
	minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org,
	richard@nod.at, miquel.raynal@bootlin.com, vigneshr@ti.com,
	dan.j.williams@intel.com, vishal.l.verma@intel.com,
	dave.jiang@intel.com, ira.weiny@intel.com, kbusch@kernel.org,
	hch@lst.de, sagi@grimberg.me
Cc: linux-block@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-mtd@lists.infradead.org, nvdimm@lists.linux.dev,
	linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
	Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 09/13] z2ram: add error handling support for add_disk()
Date: Fri, 15 Oct 2021 16:52:15 -0700	[thread overview]
Message-ID: <20211015235219.2191207-10-mcgrof@kernel.org> (raw)
In-Reply-To: <20211015235219.2191207-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.30.2


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

WARNING: multiple messages have this Message-ID (diff)
From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, geoff@infradead.org, mpe@ellerman.id.au,
	benh@kernel.crashing.org, paulus@samba.org, jim@jtan.com,
	minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org,
	richard@nod.at, miquel.raynal@bootlin.com, vigneshr@ti.com,
	dan.j.williams@intel.com, vishal.l.verma@intel.com,
	dave.jiang@intel.com, ira.weiny@intel.com, kbusch@kernel.org,
	hch@lst.de, sagi@grimberg.me
Cc: nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org,
	linux-nvme@lists.infradead.org, linux-block@vger.kernel.org,
	Luis Chamberlain <mcgrof@kernel.org>,
	linux-mtd@lists.infradead.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 09/13] z2ram: add error handling support for add_disk()
Date: Fri, 15 Oct 2021 16:52:15 -0700	[thread overview]
Message-ID: <20211015235219.2191207-10-mcgrof@kernel.org> (raw)
In-Reply-To: <20211015235219.2191207-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.30.2


  parent reply	other threads:[~2021-10-15 23:53 UTC|newest]

Thread overview: 108+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-15 23:52 [PATCH 00/13] block: add_disk() error handling stragglers Luis Chamberlain
2021-10-15 23:52 ` Luis Chamberlain
2021-10-15 23:52 ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 01/13] block/brd: add error handling support for add_disk() Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 02/13] nvme-multipath: " Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-16  0:01   ` Keith Busch
2021-10-16  0:01     ` Keith Busch
2021-10-16  0:01     ` Keith Busch
2021-10-16  4:39   ` Christoph Hellwig
2021-10-16  4:39     ` Christoph Hellwig
2021-10-16  4:39     ` Christoph Hellwig
2021-10-18  5:34   ` Chaitanya Kulkarni
2021-10-18  5:34     ` Chaitanya Kulkarni
2021-10-18  5:34     ` Chaitanya Kulkarni
2021-10-15 23:52 ` [PATCH 03/13] nvdimm/btt: do not call del_gendisk() if not needed Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-31 17:47   ` Dan Williams
2021-10-31 17:47     ` Dan Williams
2021-10-31 17:47     ` Dan Williams
2021-11-02 17:03     ` Luis Chamberlain
2021-11-02 17:03       ` Luis Chamberlain
2021-11-02 17:03       ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 04/13] nvdimm/btt: use goto error labels on btt_blk_init() Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-31 17:51   ` Dan Williams
2021-10-31 17:51     ` Dan Williams
2021-10-31 17:51     ` Dan Williams
2021-10-15 23:52 ` [PATCH 05/13] nvdimm/btt: add error handling support for add_disk() Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 06/13] nvdimm/blk: avoid calling del_gendisk() on early failures Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-16  0:13   ` Dan Williams
2021-10-16  0:13     ` Dan Williams
2021-10-16  0:13     ` Dan Williams
2021-10-19 16:06     ` Luis Chamberlain
2021-10-19 16:06       ` Luis Chamberlain
2021-10-19 16:06       ` Luis Chamberlain
2021-11-03  0:10     ` Luis Chamberlain
2021-11-03  0:10       ` Luis Chamberlain
2021-11-03  0:10       ` Luis Chamberlain
2021-11-03  0:49       ` Dan Williams
2021-11-03  0:49         ` Dan Williams
2021-11-03  0:49         ` Dan Williams
2021-11-03  1:28         ` Jens Axboe
2021-11-03  1:28           ` Jens Axboe
2021-11-03  1:28           ` Jens Axboe
2021-11-03 12:09           ` Luis Chamberlain
2021-11-03 12:09             ` Luis Chamberlain
2021-11-03 12:09             ` Luis Chamberlain
2021-11-03 12:08         ` Luis Chamberlain
2021-11-03 12:08           ` Luis Chamberlain
2021-11-03 12:08           ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 07/13] nvdimm/blk: add error handling support for add_disk() Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 08/13] zram: " Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-25 16:55   ` Minchan Kim
2021-10-25 16:55     ` Minchan Kim
2021-10-25 16:55     ` Minchan Kim
2021-10-15 23:52 ` Luis Chamberlain [this message]
2021-10-15 23:52   ` [PATCH 09/13] z2ram: " Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 10/13] ps3disk: " Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-29 15:05   ` Geoff Levand
2021-10-29 15:05     ` Geoff Levand
2021-10-29 15:05     ` Geoff Levand
2021-10-15 23:52 ` [PATCH 11/13] ps3vram: " Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-29 15:09   ` Geoff Levand
2021-10-29 15:09     ` Geoff Levand
2021-10-29 15:09     ` Geoff Levand
2021-10-15 23:52 ` [PATCH 12/13] block/sunvdc: " Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 13/13] mtd/ubi/block: " Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-15 23:52   ` Luis Chamberlain
2021-10-17 15:26 ` [PATCH 00/13] block: add_disk() error handling stragglers Geoff Levand
2021-10-17 15:26   ` Geoff Levand
2021-10-17 15:26   ` Geoff Levand
2021-10-18 16:15   ` Luis Chamberlain
2021-10-18 16:15     ` Luis Chamberlain
2021-10-18 16:15     ` Luis Chamberlain
2021-10-22  3:10     ` Geoff Levand
2021-10-22  3:10       ` Geoff Levand
2021-10-22  3:10       ` Geoff Levand
2021-10-25 15:58       ` Luis Chamberlain
2021-10-25 15:58         ` Luis Chamberlain
2021-10-25 15:58         ` Luis Chamberlain
2021-10-30 17:03 ` (subset) " Jens Axboe
2021-10-30 17:03   ` Jens Axboe
2021-10-30 17:03   ` Jens Axboe
2021-10-30 17:07 ` Jens Axboe
2021-10-30 17:07   ` Jens Axboe
2021-10-30 17:07   ` 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=20211015235219.2191207-10-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=benh@kernel.crashing.org \
    --cc=dan.j.williams@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=geoff@infradead.org \
    --cc=hch@lst.de \
    --cc=ira.weiny@intel.com \
    --cc=jim@jtan.com \
    --cc=kbusch@kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=minchan@kernel.org \
    --cc=miquel.raynal@bootlin.com \
    --cc=mpe@ellerman.id.au \
    --cc=ngupta@vflare.org \
    --cc=nvdimm@lists.linux.dev \
    --cc=paulus@samba.org \
    --cc=richard@nod.at \
    --cc=sagi@grimberg.me \
    --cc=senozhatsky@chromium.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 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.