Skip to content

Commit

Permalink
Merge tag 'md/4.0-rc4-fix' of git://neil.brown.name/md
Browse files Browse the repository at this point in the history
Pull bugfix for md from Neil Brown:
 "One fix for md in 4.0-rc4

  Regression in recent patch causes crash on error path"

* tag 'md/4.0-rc4-fix' of git://neil.brown.name/md:
  md: fix problems with freeing private data after ->run failure.
  • Loading branch information
Linus Torvalds committed Mar 22, 2015
2 parents 4541c22 + 0c35bd4 commit 1b717b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -5080,7 +5080,8 @@ int md_run(struct mddev *mddev)
}
if (err) {
mddev_detach(mddev);
pers->free(mddev, mddev->private);
if (mddev->private)
pers->free(mddev, mddev->private);
module_put(pers->owner);
bitmap_destroy(mddev);
return err;
Expand Down
2 changes: 0 additions & 2 deletions drivers/md/raid0.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,6 @@ static int raid0_run(struct mddev *mddev)
dump_zones(mddev);

ret = md_integrity_register(mddev);
if (ret)
raid0_free(mddev, conf);

return ret;
}
Expand Down

0 comments on commit 1b717b1

Please sign in to comment.