summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2013-02-21 15:50:07 +1100
committerNeilBrown <neilb@suse.de>2013-02-26 11:58:44 +1100
commitf96c9f305c24a0d4a075e2c75aa6b417aa238687 (patch)
treed0da42d7d60fbb920c3d8e5027596ed310c0ab9c
parent58ebb34c49fcfcaa029e4b1c1453d92583900f9a (diff)
downloadlinux-3.10-f96c9f305c24a0d4a075e2c75aa6b417aa238687.tar.gz
linux-3.10-f96c9f305c24a0d4a075e2c75aa6b417aa238687.tar.bz2
linux-3.10-f96c9f305c24a0d4a075e2c75aa6b417aa238687.zip
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>
-rw-r--r--drivers/md/raid0.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index d9babda582b..0505452de8d 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;