LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, martin.petersen@oracle.com, jejb@linux.ibm.com,
	kbusch@kernel.org, sagi@grimberg.me, adrian.hunter@intel.com,
	beanhuo@micron.com, ulf.hansson@linaro.org, avri.altman@wdc.com,
	swboyd@chromium.org, agk@redhat.com, snitzer@redhat.com,
	josef@toxicpanda.com
Cc: hch@infradead.org, hare@suse.de, bvanassche@acm.org,
	ming.lei@redhat.com, linux-scsi@vger.kernel.org,
	linux-nvme@lists.infradead.org, linux-mmc@vger.kernel.org,
	dm-devel@redhat.com, nbd@other.debian.org,
	linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
	Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 07/10] md: add error handling support for add_disk()
Date: Mon, 23 Aug 2021 13:29:27 -0700	[thread overview]
Message-ID: <20210823202930.137278-8-mcgrof@kernel.org> (raw)
In-Reply-To: <20210823202930.137278-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 just do the unwinding of what was not done before, and are
sure to unlock prior to bailing.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 drivers/md/md.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index ae8fe54ea358..5c0d3536d7c7 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5704,7 +5704,11 @@ static int md_alloc(dev_t dev, char *name)
 	 * through to md_open, so make sure it doesn't get too far
 	 */
 	mutex_lock(&mddev->open_mutex);
-	add_disk(disk);
+	error = add_disk(disk);
+	if (error) {
+		blk_cleanup_disk(disk);
+		goto abort_unlock;
+	}
 
 	error = kobject_add(&mddev->kobj, &disk_to_dev(disk)->kobj, "%s", "md");
 	if (error) {
@@ -5718,6 +5722,7 @@ static int md_alloc(dev_t dev, char *name)
 	if (mddev->kobj.sd &&
 	    sysfs_create_group(&mddev->kobj, &md_bitmap_group))
 		pr_debug("pointless warning\n");
+ abort_unlock:
 	mutex_unlock(&mddev->open_mutex);
  abort:
 	mutex_unlock(&disks_mutex);
-- 
2.30.2


  parent reply	other threads:[~2021-08-23 20:31 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-23 20:29 [PATCH 00/10] block: first batch of add_disk() error handling conversions Luis Chamberlain
2021-08-23 20:29 ` [PATCH 01/10] scsi/sd: use blk_cleanup_queue() insted of put_disk() Luis Chamberlain
2021-08-24  5:52   ` Christoph Hellwig
2021-08-27 18:27     ` Luis Chamberlain
2021-08-28  7:26       ` Christoph Hellwig
2021-08-23 20:29 ` [PATCH 02/10] scsi/sd: add error handling support for add_disk() Luis Chamberlain
2021-08-24  5:58   ` Christoph Hellwig
2021-08-23 20:29 ` [PATCH 03/10] scsi/sr: use blk_cleanup_disk() instead of put_disk() Luis Chamberlain
2021-08-24  6:00   ` Christoph Hellwig
2021-08-27 18:28     ` Luis Chamberlain
2021-08-23 20:29 ` [PATCH 04/10] scsi/sr: add error handling support for add_disk() Luis Chamberlain
2021-08-24  6:04   ` Christoph Hellwig
2021-08-23 20:29 ` [PATCH 05/10] nvme: " Luis Chamberlain
2021-08-24  6:09   ` Christoph Hellwig
2021-08-27 18:32     ` Luis Chamberlain
2021-08-23 20:29 ` [PATCH 06/10] mmc/core/block: " Luis Chamberlain
2021-08-24  6:13   ` Christoph Hellwig
2021-08-27 18:42     ` Luis Chamberlain
2021-08-28  7:32       ` Christoph Hellwig
2021-08-30 20:42         ` Luis Chamberlain
2021-08-23 20:29 ` Luis Chamberlain [this message]
2021-08-24  6:15   ` [PATCH 07/10] md: " Christoph Hellwig
2021-08-23 20:29 ` [PATCH 08/10] dm: add add_disk() error handling Luis Chamberlain
2021-08-24  6:21   ` Christoph Hellwig
2021-08-27 18:55     ` Luis Chamberlain
2021-08-28  7:35       ` Christoph Hellwig
2021-08-30 21:00         ` Luis Chamberlain
2021-08-23 20:29 ` [PATCH 09/10] loop: add error handling support for add_disk() Luis Chamberlain
2021-08-24  6:25   ` Christoph Hellwig
2021-08-23 20:29 ` [PATCH 10/10] nbd: " Luis Chamberlain
2021-08-24  6:27   ` Christoph Hellwig

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=20210823202930.137278-8-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=agk@redhat.com \
    --cc=avri.altman@wdc.com \
    --cc=axboe@kernel.dk \
    --cc=beanhuo@micron.com \
    --cc=bvanassche@acm.org \
    --cc=dm-devel@redhat.com \
    --cc=hare@suse.de \
    --cc=hch@infradead.org \
    --cc=jejb@linux.ibm.com \
    --cc=josef@toxicpanda.com \
    --cc=kbusch@kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=ming.lei@redhat.com \
    --cc=nbd@other.debian.org \
    --cc=sagi@grimberg.me \
    --cc=snitzer@redhat.com \
    --cc=swboyd@chromium.org \
    --cc=ulf.hansson@linaro.org \
    --subject='Re: [PATCH 07/10] md: add error handling support for add_disk()' \
    /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

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).