summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Chamberlain <mcgrof@kernel.org>2021-09-01 13:38:30 +0200
committerJens Axboe <axboe@kernel.dk>2021-10-18 14:50:10 -0600
commit9be68dd7ac0e13be2ac57770c1f921d6b3294c6e (patch)
tree2139766c2136b28a8d283b2f2e1df1e0f1bf1188
parent1f0a258f114b5b152855d31179f902cb10bdfb59 (diff)
downloadlinux-9be68dd7ac0e13be2ac57770c1f921d6b3294c6e.tar.bz2
md: 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. 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>
-rw-r--r--drivers/md/md.c6
1 files changed, 5 insertions, 1 deletions
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) {