From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 21 Jun 2016 20:07:04 +0000 (+0200)
Subject: kernel: fix missing break in ubi auto-mounting patch
X-Git-Tag: v17.01.0-rc1~2237
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dc140e00a93d54370021f819fd986290e8237cbe;p=openwrt%2Fstaging%2Fpepe2k.git

kernel: fix missing break in ubi auto-mounting patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Jo-Philipp Wich <jo@mein.io>
---

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 e4f31fdf17..3f2b439362 100644
--- 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;
 +		}
diff --git a/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index 005de3fcae..f6c71a2f63 100644
--- a/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/patches-4.1/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
-@@ -438,7 +438,27 @@ retry:
+@@ -438,7 +438,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;
 +		}
diff --git a/target/linux/generic/patches-4.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-4.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index d21e6d21ce..ab8b8bb0a2 100644
--- a/target/linux/generic/patches-4.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/patches-4.4/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
-@@ -438,7 +438,27 @@ retry:
+@@ -438,7 +438,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
-@@ -532,6 +552,10 @@ void __init mount_root(void)
+@@ -532,6 +553,10 @@ void __init mount_root(void)
  			change_floppy("root floppy");
  	}
  #endif