Skip to content

Commit

Permalink
md/raid0: If md_integrity_register() fails, raid0_run() must free the…
Browse files Browse the repository at this point in the history
… mem.

Signed-off-by: majianpeng <majianpeng@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
majianpeng authored and NeilBrown committed Apr 1, 2012
1 parent 98d5561 commit 0366ef8
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/md/raid0.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks
return array_sectors;
}

static int raid0_stop(struct mddev *mddev);

static int raid0_run(struct mddev *mddev)
{
struct r0conf *conf;
Expand Down Expand Up @@ -454,7 +456,12 @@ static int raid0_run(struct mddev *mddev)

blk_queue_merge_bvec(mddev->queue, raid0_mergeable_bvec);
dump_zones(mddev);
return md_integrity_register(mddev);

ret = md_integrity_register(mddev);
if (ret)
raid0_stop(mddev);

return ret;
}

static int raid0_stop(struct mddev *mddev)
Expand Down

0 comments on commit 0366ef8

Please sign in to comment.