Cset exclude: [email protected]|ChangeSet|20041218011100|24870
Linux Kernel Mailing List <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.2-4 |
|---|---|
| Message-ID | <[email protected]> |
ChangeSet 1.1565, 2005/01/19 06:00:55-02:00, [email protected] Cset exclude: [email protected]|ChangeSet|20041218011100|24870 do_mounts.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff -Nru a/init/do_mounts.c b/init/do_mounts.c --- a/init/do_mounts.c 2005-01-30 15:35:31 -08:00 +++ b/init/do_mounts.c 2005-01-30 15:35:31 -08:00 @@ -348,7 +348,6 @@ { char *fs_names = __getname(); char *p; - int tries = 10; get_fs_names(fs_names); retry: @@ -368,18 +367,11 @@ * Allow the user to distinguish between failed open * and bad superblock on root device. */ - if (--tries) { - printk ("VFS: Cannot open root device \"%s\" or %s, " - "retrying in 1s.\n", - root_device_name, kdevname (ROOT_DEV)); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ); - goto retry; - } printk ("VFS: Cannot open root device \"%s\" or %s\n", root_device_name, kdevname (ROOT_DEV)); printk ("Please append a correct \"root=\" boot option\n"); - break; + panic("VFS: Unable to mount root fs on %s", + kdevname(ROOT_DEV)); } panic("VFS: Unable to mount root fs on %s", kdevname(ROOT_DEV)); out: