Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b717b1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'md/4.0-rc4-fix' of git://neil.brown.name/md 

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.
parents 4541c226 0c35bd47

drivers/md/md.c

+2 −1
Original line number Diff line number Diff line
@@ -5080,6 +5080,7 @@ int md_run(struct mddev *mddev) 
	}

	if (err) {

		mddev_detach(mddev);

		if (mddev->private)

			pers->free(mddev, mddev->private);

		module_put(pers->owner);

		bitmap_destroy(mddev);

drivers/md/raid0.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}