From: NeilBrown Date: Tue, 17 Jul 2007 11:06:11 +0000 (-0700) Subject: md: improve message about invalid superblock during autodetect X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=df968c4e8d809deb2602fb0e8db758f26a4006b9;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git md: improve message about invalid superblock during autodetect People try to use raid auto-detect with version-1 superblocks (which is not supported) and get confused when they are told they have an invalid superblock. So be more explicit, and say it it is not a valid v0.90 superblock. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/md/md.c b/drivers/md/md.c index 9aefc4a023df..3d5a6beb333b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2073,9 +2073,11 @@ static mdk_rdev_t *md_import_device(dev_t newdev, int super_format, int super_mi err = super_types[super_format]. load_super(rdev, NULL, super_minor); if (err == -EINVAL) { - printk(KERN_WARNING - "md: %s has invalid sb, not importing!\n", - bdevname(rdev->bdev,b)); + printk(KERN_WARNING + "md: %s does not have a valid v%d.%d " + "superblock, not importing!\n", + bdevname(rdev->bdev,b), + super_format, super_minor); goto abort_free; } if (err < 0) { @@ -5771,7 +5773,7 @@ static void autostart_arrays(int part) for (i = 0; i < dev_cnt; i++) { dev_t dev = detected_devices[i]; - rdev = md_import_device(dev,0, 0); + rdev = md_import_device(dev,0, 90); if (IS_ERR(rdev)) continue;