From: NeilBrown <neilb@suse.de>
Date: Thu, 21 Feb 2013 04:50:07 +0000 (+1100)
Subject: md/raid0: improve error message when converting RAID4-with-spares to RAID0
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f96c9f305c24a0d4a075e2c75aa6b417aa238687;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

md/raid0: improve error message when converting RAID4-with-spares to RAID0

Mentioning "bad disk number -1" exposes irrelevant internal detail.
Just say they are inactive and must be removed.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index d9babda582b9..0505452de8d6 100644
--- a/drivers/md/raid0.c
+++ b/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;