3 files changed, 71 insertions, 44 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 3b5adbf228c7..6135d07f31ec 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -845,9 +845,9 @@ config MODULE_FORCE_LOAD
         depends on MODULES
         default n
         help
-          This option allows loading of modules even if that would set the
-          'F' (forced) taint, due to lack of version info.  Which is
-          usually a really bad idea.
+          Allow loading of modules without version information (ie. modprobe
+          --force).  Forced module loading sets the 'F' (forced) taint flag and
+          is usually a really bad idea.
 
 config MODULE_UNLOAD
         bool "Module unloading"
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3885e70e7759..660c1e50c91b 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -76,6 +76,7 @@ dev_t name_to_dev_t(char *name)
         char s[32];
         char *p;
         dev_t res = 0;
+        int part;
 
         if (strncmp(name, "/dev/", 5) != 0) {
                 unsigned maj, min;
@@ -106,7 +107,31 @@ dev_t name_to_dev_t(char *name)
         for (p = s; *p; p++)
                 if (*p == '/')
                         *p = '!';
-        res = blk_lookup_devt(s);
+        res = blk_lookup_devt(s, 0);
+        if (res)
+                goto done;
+
+        /*
+         * try non-existant, but valid partition, which may only exist
+         * after revalidating the disk, like partitioned md devices
+         */
+        while (p > s && isdigit(p[-1]))
+                p--;
+        if (p == s || !*p || *p == '0')
+                goto fail;
+
+        /* try disk name without <part number> */
+        part = simple_strtoul(p, NULL, 10);
+        *p = '\0';
+        res = blk_lookup_devt(s, part);
+        if (res)
+                goto done;
+
+        /* try disk name without p<part number> */
+        if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')
+                goto fail;
+        p[-1] = '\0';
+        res = blk_lookup_devt(s, part);
         if (res)
                 goto done;
 
diff --git a/init/main.c b/init/main.c
index ddada7acf363..f7fb20021d48 100644
--- a/init/main.c
+++ b/init/main.c
@@ -693,55 +693,57 @@ static int __init initcall_debug_setup(char *str)
 }
 __setup("initcall_debug", initcall_debug_setup);
 
-extern initcall_t __initcall_start[], __initcall_end[];
-
-static void __init do_initcalls(void)
+static void __init do_one_initcall(initcall_t fn)
 {
-        initcall_t *call;
         int count = preempt_count();
+        ktime_t t0, t1, delta;
+        char msgbuf[64];
+        int result;
 
-        for (call = __initcall_start; call < __initcall_end; call++) {
-                ktime_t t0, t1, delta;
-                char *msg = NULL;
-                char msgbuf[40];
-                int result;
+        if (initcall_debug) {
+                print_fn_descriptor_symbol("calling  %s\n", fn);
+                t0 = ktime_get();
+        }
 
-                if (initcall_debug) {
-                        print_fn_descriptor_symbol("calling  %s()\n",
-                                        (unsigned long) *call);
-                        t0 = ktime_get();
-                }
+        result = fn();
 
-                result = (*call)();
+        if (initcall_debug) {
+                t1 = ktime_get();
+                delta = ktime_sub(t1, t0);
 
-                if (initcall_debug) {
-                        t1 = ktime_get();
-                        delta = ktime_sub(t1, t0);
+                print_fn_descriptor_symbol("initcall %s", fn);
+                printk(" returned %d after %Ld msecs\n", result,
+                        (unsigned long long) delta.tv64 >> 20);
+        }
 
-                        print_fn_descriptor_symbol("initcall %s()",
-                                        (unsigned long) *call);
-                        printk(" returned %d after %Ld msecs\n", result,
-                                (unsigned long long) delta.tv64 >> 20);
-                }
+        msgbuf[0] = 0;
 
-                if (result && result != -ENODEV && initcall_debug) {
-                        sprintf(msgbuf, "error code %d", result);
-                        msg = msgbuf;
-                }
-                if (preempt_count() != count) {
-                        msg = "preemption imbalance";
-                        preempt_count() = count;
-                }
-                if (irqs_disabled()) {
-                        msg = "disabled interrupts";
-                        local_irq_enable();
-                }
-                if (msg) {
-                        print_fn_descriptor_symbol(KERN_WARNING "initcall %s()",
-                                        (unsigned long) *call);
-                        printk(" returned with %s\n", msg);
-                }
+        if (result && result != -ENODEV && initcall_debug)
+                sprintf(msgbuf, "error code %d ", result);
+
+        if (preempt_count() != count) {
+                strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
+                preempt_count() = count;
+        }
+        if (irqs_disabled()) {
+                strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
+                local_irq_enable();
+        }
+        if (msgbuf[0]) {
+                print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn);
+                printk(" returned with %s\n", msgbuf);
         }
+}
+
+
+extern initcall_t __initcall_start[], __initcall_end[];
+
+static void __init do_initcalls(void)
+{
+        initcall_t *call;
+
+        for (call = __initcall_start; call < __initcall_end; call++)
+                do_one_initcall(*call);
 
         /* Make sure there is no pending stuff from the initcall sequence */
         flush_scheduled_work();