Skip to content

Commit

Permalink
md/raid0: don't free conf on raid0_run failure
Browse files Browse the repository at this point in the history
The core md code calls the ->free method which already frees conf.

Fixes: 0c031fd ("md: Move alloc/free acct bioset in to personality")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20240604172607.3185916-2-hch@lst.de
  • Loading branch information
Christoph Hellwig authored and Song Liu committed Jun 10, 2024
1 parent acc6680 commit 35f20ac
Showing 1 changed file with 5 additions and 16 deletions.
21 changes: 5 additions & 16 deletions drivers/md/raid0.c
Original file line number Diff line number Diff line change
Expand Up @@ -365,18 +365,13 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks
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)
{
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)
Expand Down Expand Up @@ -415,7 +410,7 @@ static int raid0_run(struct mddev *mddev)
if (!mddev_is_dm(mddev)) {
ret = raid0_set_limits(mddev);
if (ret)
goto out_free_conf;
return ret;
}

/* calculate array device size */
Expand All @@ -427,13 +422,7 @@ static int raid0_run(struct mddev *mddev)

dump_zones(mddev);

ret = md_integrity_register(mddev);
if (ret)
goto out_free_conf;
return 0;
out_free_conf:
free_conf(mddev, conf);
return ret;
return md_integrity_register(mddev);
}

/*
Expand Down

0 comments on commit 35f20ac

Please sign in to comment.