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

torvalds · torvalds · commit 1b717b1af5b4 · 2015-03-22T16:38:19.000-07:00
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 -&gt;run failure.
diff --git a/drivers/md/md.c b/drivers/md/md.c
@@ -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;
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,6 @@ static int raid0_run(struct mddev *mddev)`
`467`	`467`	`dump_zones(mddev);`
`468`	`468`
`469`	`469`	`ret = md_integrity_register(mddev);`
`470`		`- if (ret)`
`471`		`- raid0_free(mddev, conf);`
`472`	`470`
`473`	`471`	`return ret;`
`474`	`472`	`}`