From: Luis Chamberlain <mcgrof@kernel.org>

Date: Wed, 1 Sep 2021 13:38:30 +0200

Subject: [PATCH] md: add error handling support for add_disk()

Git-commit: 9be68dd7ac0e13be2ac57770c1f921d6b3294c6e

Patch-mainline: v5.16-rc1

References: jsc#PED-1183

We never checked for errors on add_disk() as this function

returned void. Now that this is fixed, use the shiny new

error handling.

We just do the unwinding of what was not done before, and are

sure to unlock prior to bailing.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

Signed-off-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Song Liu <songliubraving@fb.com>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/md/md.c | 6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c

index 22310d5d8d41..eff3d23e1fcd 100644

--- a/drivers/md/md.c

+++ b/drivers/md/md.c

@@ -5700,7 +5700,11 @@ static int md_alloc(dev_t dev, char *name)

 	disk->flags |= GENHD_FL_EXT_DEVT;

 	disk->events |= DISK_EVENT_MEDIA_CHANGE;

 	mddev->gendisk = disk;

-	add_disk(disk);

+	error = add_disk(disk);

+	if (error) {

+		blk_cleanup_disk(disk);

+		goto abort;

+	}

 	error = kobject_add(&mddev->kobj, &disk_to_dev(disk)->kobj, "%s", "md");

 	if (error) {

-- 

2.35.3