Thread (15 messages) 15 messages, 3 authors, 2021-08-30
STALE1768d
Revisions (5)
  1. v1 [diff vs current]
  2. v2 [diff vs current]
  3. v1 current
  4. v3 [diff vs current]
  5. v4 [diff vs current]

[PATCH 06/10] nvdimm/btt: add error handling support for add_disk()

From: Luis Chamberlain <mcgrof@kernel.org>
Date: 2021-08-27 19:18:40
Also in: linux-bcache, linux-nvme, lkml, nvdimm, xen-devel
Subsystem: libnvdimm btt: block translation table, libnvdimm: non-volatile memory device subsystem, the rest · Maintainers: Vishal Verma, Dan Williams, Dave Jiang, Alison Schofield, Linus Torvalds

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/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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help