[PATCH 03/12] md/raid1: don't free conf on raid0_run failure

[Christoph Hellwig]

The core md code calls the ->free method which already frees conf.

Fixes: 07f1a6850c5d ("md/raid1: fail run raid1 array when active disk less than 
one")
Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 drivers/md/raid1.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 7b8a71ca66dde0..1f321826ef02ba 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3204,7 +3204,6 @@ static int raid1_set_limits(struct mddev *mddev)
        return queue_limits_set(mddev->gendisk->queue, &lim);
 }
 
-static void raid1_free(struct mddev *mddev, void *priv);
 static int raid1_run(struct mddev *mddev)
 {
        struct r1conf *conf;
@@ -3238,7 +3237,7 @@ static int raid1_run(struct mddev *mddev)
        if (!mddev_is_dm(mddev)) {
                ret = raid1_set_limits(mddev);
                if (ret)
-                       goto abort;
+                       return ret;
        }
 
        mddev->degraded = 0;
@@ -3252,8 +3251,7 @@ static int raid1_run(struct mddev *mddev)
         */
        if (conf->raid_disks - mddev->degraded < 1) {
                md_unregister_thread(mddev, &conf->thread);
-               ret = -EINVAL;
-               goto abort;
+               return -EINVAL;
        }
 
        if (conf->raid_disks - mddev->degraded == 1)
@@ -3277,14 +3275,8 @@ static int raid1_run(struct mddev *mddev)
        md_set_array_sectors(mddev, raid1_size(mddev, 0, 0));
 
        ret = md_integrity_register(mddev);
-       if (ret) {
+       if (ret)
                md_unregister_thread(mddev, &mddev->thread);
-               goto abort;
-       }
-       return 0;
-
-abort:
-       raid1_free(mddev, conf);
        return ret;
 }
 
-- 
2.43.0