linux-bcache.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, colyli@suse.de, kent.overstreet@gmail.com,
	kbusch@kernel.org, sagi@grimberg.me, vishal.l.verma@intel.com,
	dan.j.williams@intel.com, dave.jiang@intel.com,
	ira.weiny@intel.com, konrad.wilk@oracle.com,
	roger.pau@citrix.com, boris.ostrovsky@oracle.com,
	jgross@suse.com, sstabellini@kernel.org, minchan@kernel.org,
	ngupta@vflare.org, senozhatsky@chromium.org
Cc: xen-devel@lists.xenproject.org, nvdimm@lists.linux.dev,
	linux-nvme@lists.infradead.org, linux-bcache@vger.kernel.org,
	linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
	Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v2 10/10] zram: add error handling support for add_disk()
Date: Mon, 27 Sep 2021 15:00:39 -0700	[thread overview]
Message-ID: <20210927220039.1064193-11-mcgrof@kernel.org> (raw)
In-Reply-To: <20210927220039.1064193-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.

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

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index f61910c65f0f..59086e178fbd 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1953,7 +1953,9 @@ static int zram_add(void)
 		blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX);
 
 	blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, zram->disk->queue);
-	device_add_disk(NULL, zram->disk, zram_disk_attr_groups);
+	ret = device_add_disk(NULL, zram->disk, zram_disk_attr_groups);
+	if (ret)
+		goto out_cleanup_disk;
 
 	strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));
 
@@ -1961,6 +1963,8 @@ static int zram_add(void)
 	pr_info("Added device: %s\n", zram->disk->disk_name);
 	return device_id;
 
+out_cleanup_disk:
+	blk_cleanup_disk(zram->disk);
 out_free_idr:
 	idr_remove(&zram_index_idr, device_id);
 out_free_dev:
-- 
2.30.2


  parent reply	other threads:[~2021-09-27 22:01 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-27 22:00 [PATCH v2 00/10] block: second batch of add_disk() error handling conversions Luis Chamberlain
2021-09-27 22:00 ` [PATCH v2 01/10] block/brd: add error handling support for add_disk() Luis Chamberlain
2021-09-27 22:00 ` [PATCH v2 02/10] bcache: " Luis Chamberlain
2021-09-27 22:00 ` [PATCH v2 03/10] nvme-multipath: " Luis Chamberlain
2021-09-27 22:13   ` Keith Busch
2021-09-28  5:39   ` Hannes Reinecke
2021-09-27 22:00 ` [PATCH v2 04/10] nvdimm/btt: do not call del_gendisk() if not needed Luis Chamberlain
2021-09-27 22:00 ` [PATCH v2 05/10] nvdimm/btt: use goto error labels on btt_blk_init() Luis Chamberlain
2021-09-27 22:00 ` [PATCH v2 06/10] nvdimm/btt: add error handling support for add_disk() Luis Chamberlain
2021-09-27 22:00 ` [PATCH v2 07/10] nvdimm/blk: avoid calling del_gendisk() on early failures Luis Chamberlain
2021-09-27 22:00 ` [PATCH v2 08/10] nvdimm/blk: add error handling support for add_disk() Luis Chamberlain
2021-09-27 22:00 ` [PATCH v2 09/10] xen-blkfront: " Luis Chamberlain
2021-09-30 13:07   ` Juergen Gross
2021-09-27 22:00 ` Luis Chamberlain [this message]
2021-09-27 22:33 ` [PATCH v2 00/10] block: second 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=20210927220039.1064193-11-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=boris.ostrovsky@oracle.com \
    --cc=colyli@suse.de \
    --cc=dan.j.williams@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=ira.weiny@intel.com \
    --cc=jgross@suse.com \
    --cc=kbusch@kernel.org \
    --cc=kent.overstreet@gmail.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-bcache@vger.kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=minchan@kernel.org \
    --cc=ngupta@vflare.org \
    --cc=nvdimm@lists.linux.dev \
    --cc=roger.pau@citrix.com \
    --cc=sagi@grimberg.me \
    --cc=senozhatsky@chromium.org \
    --cc=sstabellini@kernel.org \
    --cc=vishal.l.verma@intel.com \
    --cc=xen-devel@lists.xenproject.org \
    --subject='Re: [PATCH v2 10/10] zram: 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).