kernel: update kernel 3.18 to version 3.18.43

[openwrt/openwrt.git] / target / linux / generic / patches-3.18 / 492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch

diff --git a/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index e4f31fdf176393bd05fa304b97e88db185dbb7d2..54a2f8259c9189f4b8185551cb4b2f9ca369fef1 100644 (file)
--- a/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
-@@ -433,7 +433,27 @@ retry:
+@@ -433,7 +433,28 @@ retry:
  out:
        put_page(page);
  }
@@ -29,6 +29,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +                      case -EACCES:
 +                              flags |= MS_RDONLY;
 +                              tried++;
++                              break;
 +                      default:
 +                              return err;
 +              }
@@ -40,7 +41,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  #ifdef CONFIG_ROOT_NFS
  
  #define NFSROOT_TIMEOUT_MIN   5
-@@ -527,6 +547,10 @@ void __init mount_root(void)
+@@ -527,6 +548,10 @@ void __init mount_root(void)
                        change_floppy("root floppy");
        }
  #endif