[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210827191809.3118103-7-mcgrof@kernel.org>
Date: Fri, 27 Aug 2021 12:18:05 -0700
From: Luis Chamberlain <mcgrof@...nel.org>
To: axboe@...nel.dk, colyli@...e.de, kent.overstreet@...il.com,
kbusch@...nel.org, sagi@...mberg.me, vishal.l.verma@...el.com,
dan.j.williams@...el.com, dave.jiang@...el.com,
ira.weiny@...el.com, konrad.wilk@...cle.com, roger.pau@...rix.com,
boris.ostrovsky@...cle.com, jgross@...e.com,
sstabellini@...nel.org, minchan@...nel.org, ngupta@...are.org,
senozhatsky@...omium.org
Cc: xen-devel@...ts.xenproject.org, nvdimm@...ts.linux.dev,
linux-nvme@...ts.infradead.org, linux-bcache@...r.kernel.org,
linux-block@...r.kernel.org, linux-kernel@...r.kernel.org,
Luis Chamberlain <mcgrof@...nel.org>
Subject: [PATCH 06/10] nvdimm/btt: add error handling support for add_disk()
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@...nel.org>
---
drivers/nvdimm/btt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 275704d80109..abdac4b7769f 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1542,7 +1542,9 @@ static int btt_blk_init(struct btt *btt)
}
set_capacity(btt->btt_disk, btt->nlba * btt->sector_size >> 9);
- device_add_disk(&btt->nd_btt->dev, btt->btt_disk, NULL);
+ rc = device_add_disk(&btt->nd_btt->dev, btt->btt_disk, NULL);
+ if (rc)
+ goto out_cleanup_disk;
btt->nd_btt->size = btt->nlba * (u64)btt->sector_size;
nvdimm_check_and_set_ro(btt->btt_disk);
--
2.30.2
Powered by blists - more mailing lists