dm-devel.redhat.com archive mirror
 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: linux-block@vger.kernel.org, bvanassche@acm.org,
	linux-scsi@vger.kernel.org, linux-mmc@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
	ming.lei@redhat.com, hch@infradead.org, dm-devel@redhat.com,
	nbd@other.debian.org, Luis Chamberlain <mcgrof@kernel.org>
Subject: [dm-devel] [PATCH v3 4/8] mmc/core/block: add error handling support for add_disk()
Date: Mon, 30 Aug 2021 14:25:34 -0700	[thread overview]
Message-ID: <20210830212538.148729-5-mcgrof@kernel.org> (raw)
In-Reply-To: <20210830212538.148729-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 only cleanups the disk if we pass on an allocated md
but on error we return return ERR_PTR(ret), and so we must do all
the unwinding ourselves.

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

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 6a15fdf6e5f2..9b2856aa6231 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2453,9 +2453,14 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
 	/* used in ->open, must be set before add_disk: */
 	if (area_type == MMC_BLK_DATA_AREA_MAIN)
 		dev_set_drvdata(&card->dev, md);
-	device_add_disk(md->parent, md->disk, mmc_disk_attr_groups);
+	ret = device_add_disk(md->parent, md->disk, mmc_disk_attr_groups);
+	if (ret)
+		goto err_cleanup_queue;
 	return md;
 
+ err_cleanup_queue:
+	blk_cleanup_queue(md->disk->queue);
+	blk_mq_free_tag_set(&md->queue.tag_set);
  err_kfree:
 	kfree(md);
  out:
-- 
2.30.2

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel


  parent reply	other threads:[~2021-08-30 21:26 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-30 21:25 [dm-devel] [PATCH v3 0/8] block: first batch of add_disk() error handling conversions Luis Chamberlain
2021-08-30 21:25 ` [dm-devel] [PATCH v3 1/8] scsi/sd: add error handling support for add_disk() Luis Chamberlain
2021-09-06  6:13   ` Hannes Reinecke
2021-09-07  1:29   ` Ming Lei
2021-09-13 17:21     ` Luis Chamberlain
2021-08-30 21:25 ` [dm-devel] [PATCH v3 2/8] scsi/sr: " Luis Chamberlain
2021-09-06  6:13   ` Hannes Reinecke
2021-09-07  1:37   ` Ming Lei
2021-09-13 17:26     ` Luis Chamberlain
2021-08-30 21:25 ` [dm-devel] [PATCH v3 3/8] nvme: " Luis Chamberlain
2021-09-06  6:16   ` Hannes Reinecke
2021-09-06  8:09     ` Christoph Hellwig
2021-09-06  8:09   ` Christoph Hellwig
2021-08-30 21:25 ` Luis Chamberlain [this message]
2021-09-06 17:10   ` [dm-devel] [PATCH v3 4/8] mmc/core/block: " Ulf Hansson
2021-08-30 21:25 ` [dm-devel] [PATCH v3 5/8] md: " Luis Chamberlain
2021-09-06  6:17   ` Hannes Reinecke
2021-08-30 21:25 ` [dm-devel] [PATCH v3 6/8] dm: add add_disk() error handling Luis Chamberlain
2021-09-06  6:19   ` Hannes Reinecke
2021-08-30 21:25 ` [dm-devel] [PATCH v3 7/8] loop: add error handling support for add_disk() Luis Chamberlain
2021-09-06  6:19   ` Hannes Reinecke
2021-08-30 21:25 ` [dm-devel] [PATCH v3 8/8] nbd: " Luis Chamberlain
2021-09-06  6:20   ` Hannes Reinecke

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=20210830212538.148729-5-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=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: [dm-devel] [PATCH v3 4/8] mmc/core/block: 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).