From 1ef05a66a8f19f377b026738817f78a71ff219da Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 21 Feb 2013 15:50:07 +1100
Subject: [PATCH] --- yaml --- r: 360743 b: refs/heads/master c:
 f96c9f305c24a0d4a075e2c75aa6b417aa238687 h: refs/heads/master i:   360741:
 34c088f8f3b258e8102088470944c89393ca2098   360739:
 05373156fbd495466e869be77cf394d37cea6379   360735:
 c866dafdbb345bb19f038c929f0e5c6f23da61e6 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/md/raid0.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7037dbf402dc..e97c535c63ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58ebb34c49fcfcaa029e4b1c1453d92583900f9a
+refs/heads/master: f96c9f305c24a0d4a075e2c75aa6b417aa238687
diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c
index d9babda582b9..0505452de8d6 100644
--- a/trunk/drivers/md/raid0.c
+++ b/trunk/drivers/md/raid0.c
@@ -175,7 +175,13 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
 			rdev1->new_raid_disk = j;
 		}
 
-		if (j < 0 || j >= mddev->raid_disks) {
+		if (j < 0) {
+			printk(KERN_ERR
+			       "md/raid0:%s: remove inactive devices before converting to RAID0\n",
+			       mdname(mddev));
+			goto abort;
+		}
+		if (j >= mddev->raid_disks) {
 			printk(KERN_ERR "md/raid0:%s: bad disk number %d - "
 			       "aborting!\n", mdname(mddev), j);
 			goto abort;