@@ -358,6 +358,18 @@ void __init mount_root(void)
#endif
}
+/**
+ * root_present - determine whether the root device is available yet
+ *
+ * Returns true if the root device is available, false if not. The check to
+ * see if the root device is available is done by check to see whether it
+ * has been assigned a major/minor device number.
+ */
+static bool root_present(void)
+{
+ return name_to_dev_t(saved_root_name) != 0;
+}
+
/*
* Prepare the namespace - decide what/where to mount, load ramdisks, etc.
*/
@@ -398,12 +410,21 @@ void __init prepare_namespace(void)
goto out;
/* wait for any asynchronous scanning to complete */
- if ((ROOT_DEV == 0) && root_wait) {
+ if (ROOT_DEV == 0) {
printk(KERN_INFO "Waiting for root device %s...\n",
saved_root_name);
- while (driver_probe_done() != 0 ||
- (ROOT_DEV = name_to_dev_t(saved_root_name)) == 0)
- msleep(100);
+ if (root_wait) {
+ while (driver_probe_done() != 0 ||
+ (ROOT_DEV = name_to_dev_t(saved_root_name)) ==
+ 0)
+ msleep(100);
+ }
+
+ else {
+ initdev_wait(INITDEV_BLOCK_TYPE, root_present);
+ ROOT_DEV = name_to_dev_t(saved_root_name);
+ }
+
async_synchronize_full();
}
Use the initdev infrastructure to wait for a root device to become available. This should make most uses of the kernel rootwait parameter unnecessary. The only time it should be necessary is when the root device might not be attached at boot time. Signed-off-by: David VomLehn <dvomlehn@cisco> --- init/do_mounts.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html