All of lore.kernel.org
 help / color / mirror / Atom feed
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 v5 12/14] ataflop: address add_disk() error handling on probe
Date: Wed,  3 Nov 2021 16:04:35 -0700	[thread overview]
Message-ID: <20211103230437.1639990-13-mcgrof@kernel.org> (raw)
In-Reply-To: <20211103230437.1639990-1-mcgrof@kernel.org>

We need to cleanup resources on the probe() callback registered
with __register_blkdev(), now that add_disk() error handling is
supported. Address this.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 drivers/block/ataflop.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 170dd193cef6..de8c3785899a 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -2018,12 +2018,18 @@ static void ataflop_probe(dev_t dev)
 
 	if (drive >= FD_MAX_UNITS || type >= NUM_DISK_MINORS)
 		return;
-	if (!unit[drive].disk[type]) {
-		if (ataflop_alloc_disk(drive, type) == 0) {
-			add_disk(unit[drive].disk[type]);
-			unit[drive].registered[type] = true;
-		}
-	}
+	if (unit[drive].disk[type])
+		return
+	if (ataflop_alloc_disk(drive, type))
+		return;
+	if (add_disk(unit[drive].disk[type]))
+		goto cleanup_disk;
+	unit[drive].registered[type] = true;
+	return;
+
+cleanup_disk:
+	blk_cleanup_disk(unit[drive].disk[type]);
+	unit[drive].disk[type] = NULL;
 }
 
 static void atari_floppy_cleanup(void)
-- 
2.33.0


WARNING: multiple messages have this Message-ID (diff)
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 v5 12/14] ataflop: address add_disk() error handling on probe
Date: Wed,  3 Nov 2021 16:04:35 -0700	[thread overview]
Message-ID: <20211103230437.1639990-13-mcgrof@kernel.org> (raw)
In-Reply-To: <20211103230437.1639990-1-mcgrof@kernel.org>

We need to cleanup resources on the probe() callback registered
with __register_blkdev(), now that add_disk() error handling is
supported. Address this.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 drivers/block/ataflop.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 170dd193cef6..de8c3785899a 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -2018,12 +2018,18 @@ static void ataflop_probe(dev_t dev)
 
 	if (drive >= FD_MAX_UNITS || type >= NUM_DISK_MINORS)
 		return;
-	if (!unit[drive].disk[type]) {
-		if (ataflop_alloc_disk(drive, type) == 0) {
-			add_disk(unit[drive].disk[type]);
-			unit[drive].registered[type] = true;
-		}
-	}
+	if (unit[drive].disk[type])
+		return
+	if (ataflop_alloc_disk(drive, type))
+		return;
+	if (add_disk(unit[drive].disk[type]))
+		goto cleanup_disk;
+	unit[drive].registered[type] = true;
+	return;
+
+cleanup_disk:
+	blk_cleanup_disk(unit[drive].disk[type]);
+	unit[drive].disk[type] = NULL;
 }
 
 static void atari_floppy_cleanup(void)
-- 
2.33.0


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

  parent reply	other threads:[~2021-11-03 23:05 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-03 23:04 [PATCH v5 00/14] last set for add_disk() error handling Luis Chamberlain
2021-11-03 23:04 ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 01/14] nvdimm/btt: use goto error labels on btt_blk_init() Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 02/14] nvdimm/btt: add error handling support for add_disk() Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 03/14] nvdimm/blk: avoid calling del_gendisk() on early failures Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 04/14] nvdimm/blk: add error handling support for add_disk() Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 05/14] nvdimm/pmem: cleanup the disk if pmem_release_disk() is yet assigned Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 06/14] nvdimm/pmem: use add_disk() error handling Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 07/14] z2ram: add error handling support for add_disk() Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 08/14] block/sunvdc: " Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 09/14] mtd/ubi/block: " Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 10/14] ataflop: remove ataflop_probe_lock mutex Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 11/14] block: update __register_blkdev() probe documentation Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` Luis Chamberlain [this message]
2021-11-03 23:04   ` [PATCH v5 12/14] ataflop: address add_disk() error handling on probe Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 13/14] floppy: " Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-03 23:04 ` [PATCH v5 14/14] block: add __must_check for *add_disk*() callers Luis Chamberlain
2021-11-03 23:04   ` Luis Chamberlain
2021-11-04 11:49 ` [PATCH v5 00/14] last set for add_disk() error handling Jens Axboe
2021-11-04 11:49   ` Jens Axboe
2021-11-04 12:53   ` Jens Axboe
2021-11-04 12:53     ` Jens Axboe
2021-11-04 17:07     ` Luis Chamberlain
2021-11-04 17:07       ` Luis Chamberlain
2021-11-04 17:10       ` Jens Axboe
2021-11-04 17:10         ` Jens Axboe
2021-11-04 18:16         ` Luis Chamberlain
2021-11-04 18:16           ` 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=20211103230437.1639990-13-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 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.