init: clear root_wait on all invalid root= strings

Instead of only clearing root_wait in devt_from_partuuid when the UUID
format was invalid, do that in parse_root_device for all strings that
failed to parse.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/init/do_mounts.c b/init/do_mounts.c
index f1953aeb321978e6fb06a53006f07d9d7ba53041..0b36a5f39ee8e25372b8e460fd8fc00363255d1e 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -112,14 +112,14 @@ static int devt_from_partuuid(const char *uuid_str, dev_t *devt)
 
                /* Explicitly fail on poor PARTUUID syntax. */
                if (sscanf(slash + 1, "PARTNROFF=%d%c", &offset, &c) != 1)
-                       goto clear_root_wait;
+                       goto out_invalid;
                cmp.len = slash - uuid_str;
        } else {
                cmp.len = strlen(uuid_str);
        }
 
        if (!cmp.len)
-               goto clear_root_wait;
+               goto out_invalid;
 
        dev = class_find_device(&block_class, NULL, &cmp, &match_dev_by_uuid);
        if (!dev)
@@ -139,12 +139,9 @@ static int devt_from_partuuid(const char *uuid_str, dev_t *devt)
        put_device(dev);
        return 0;
 
-clear_root_wait:
+out_invalid:
        pr_err("VFS: PARTUUID= is invalid.\n"
               "Expected PARTUUID=<valid-uuid-id>[/PARTNROFF=%%d]\n");
-       if (root_wait)
-               pr_err("Disabling rootwait; root= is invalid.\n");
-       root_wait = 0;
        return -EINVAL;
 }
 
@@ -611,6 +608,7 @@ static void __init wait_for_root(char *root_device_name)
 
 static dev_t __init parse_root_device(char *root_device_name)
 {
+       int error;
        dev_t dev;
 
        if (!strncmp(root_device_name, "mtd", 3) ||
@@ -623,8 +621,14 @@ static dev_t __init parse_root_device(char *root_device_name)
        if (strcmp(root_device_name, "/dev/ram") == 0)
                return Root_RAM0;
 
-       if (early_lookup_bdev(root_device_name, &dev))
+       error = early_lookup_bdev(root_device_name, &dev);
+       if (error) {
+               if (error == -EINVAL && root_wait) {
+                       pr_err("Disabling rootwait; root= is invalid.\n");
+                       root_wait = 0;
+               }
                return 0;
+       }
        return dev;
 }