fastboot: make the RAID autostart code print a message just before waiting

[deliverable/linux.git] / init / do_mounts_md.c

diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index 7473b0c59d4dd11c438bd4808c0044caba4e7a33..1ec5c41c8a3c2799337826a602fc46384a02e1c6 100644 (file)
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -24,7 +24,6 @@ static struct {
 
 static int md_setup_ents __initdata;
 
-extern int mdp_major;
 /*
  * Parse the command-line parameters given our kernel, but do not
  * actually try to invoke the MD device now; that is handled by
@@ -268,9 +267,18 @@ __setup("md=", md_setup);
 void __init md_run_setup(void)
 {
        create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
+
        if (raid_noautodetect)
                printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
        else {
+               /* 
+                * Since we don't want to detect and use half a raid array, we need to
+                * wait for the known devices to complete their probing
+                */
+               printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
+               printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
+               while (driver_probe_done() < 0)
+                       msleep(100);
                int fd = sys_open("/dev/md0", 0, 0);
                if (fd >= 0) {
                        sys_ioctl(fd, RAID_AUTORUN, raid_autopart);