Commit d11854ed authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

md/raid0: don't free conf on raid0_run failure

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

Fixes: 0c031fd3 ("md: Move alloc/free acct bioset in to personality")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240613084839.1044015-3-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 899ee2c3
...@@ -365,18 +365,13 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks ...@@ -365,18 +365,13 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks
return array_sectors; return array_sectors;
} }
static void free_conf(struct mddev *mddev, struct r0conf *conf)
{
kfree(conf->strip_zone);
kfree(conf->devlist);
kfree(conf);
}
static void raid0_free(struct mddev *mddev, void *priv) static void raid0_free(struct mddev *mddev, void *priv)
{ {
struct r0conf *conf = priv; struct r0conf *conf = priv;
free_conf(mddev, conf); kfree(conf->strip_zone);
kfree(conf->devlist);
kfree(conf);
} }
static int raid0_set_limits(struct mddev *mddev) static int raid0_set_limits(struct mddev *mddev)
...@@ -415,7 +410,7 @@ static int raid0_run(struct mddev *mddev) ...@@ -415,7 +410,7 @@ static int raid0_run(struct mddev *mddev)
if (!mddev_is_dm(mddev)) { if (!mddev_is_dm(mddev)) {
ret = raid0_set_limits(mddev); ret = raid0_set_limits(mddev);
if (ret) if (ret)
goto out_free_conf; return ret;
} }
/* calculate array device size */ /* calculate array device size */
...@@ -427,13 +422,7 @@ static int raid0_run(struct mddev *mddev) ...@@ -427,13 +422,7 @@ static int raid0_run(struct mddev *mddev)
dump_zones(mddev); dump_zones(mddev);
ret = md_integrity_register(mddev); return md_integrity_register(mddev);
if (ret)
goto out_free_conf;
return 0;
out_free_conf:
free_conf(mddev, conf);
return ret;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment