---

yaml --- r: 298546 b: refs/heads/master c: 0366ef8 h: refs/heads/master v: v3
git-mirror · Apr 1, 2012 · 8ca6a24 · 8ca6a24
1 parent e5c33ed
commit 8ca6a24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98d5561bfbc3c7a53d6abc1812a2bd5344d36fa3
+refs/heads/master: 0366ef847581d692e197b88825867ca9ee00e358
diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c
@@ -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;
@@ -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)