[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20211015235219.2191207-14-mcgrof@kernel.org>
Date: Fri, 15 Oct 2021 16:52:19 -0700
From: Luis Chamberlain <mcgrof@...nel.org>
To: axboe@...nel.dk, geoff@...radead.org, mpe@...erman.id.au,
benh@...nel.crashing.org, paulus@...ba.org, jim@...n.com,
minchan@...nel.org, ngupta@...are.org, senozhatsky@...omium.org,
richard@....at, miquel.raynal@...tlin.com, vigneshr@...com,
dan.j.williams@...el.com, vishal.l.verma@...el.com,
dave.jiang@...el.com, ira.weiny@...el.com, kbusch@...nel.org,
hch@....de, sagi@...mberg.me
Cc: linux-block@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
linux-mtd@...ts.infradead.org, nvdimm@...ts.linux.dev,
linux-nvme@...ts.infradead.org, linux-kernel@...r.kernel.org,
Luis Chamberlain <mcgrof@...nel.org>
Subject: [PATCH 13/13] mtd/ubi/block: 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/mtd/ubi/block.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index e003b4b44ffa..062e6c2c45f5 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -447,12 +447,18 @@ int ubiblock_create(struct ubi_volume_info *vi)
list_add_tail(&dev->list, &ubiblock_devices);
/* Must be the last step: anyone can call file ops from now on */
- add_disk(dev->gd);
+ ret = add_disk(dev->gd);
+ if (ret)
+ goto out_destroy_wq;
+
dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",
dev->ubi_num, dev->vol_id, vi->name);
mutex_unlock(&devices_mutex);
return 0;
+out_destroy_wq:
+ list_del(&dev->list);
+ destroy_workqueue(dev->wq);
out_remove_minor:
idr_remove(&ubiblock_minor_idr, gd->first_minor);
out_cleanup_disk:
--
2.30.2
Powered by blists - more mailing lists