diff options
| author | John Crispin <john@openwrt.org> | 2014-06-11 12:59:15 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-06-11 12:59:15 +0000 |
| commit | c8d472c37f07e3a0d7a5ba05ec3b7538a72ad81c (patch) | |
| tree | 038631553628aa0beb963792b5dc13454bbead28 /target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | |
| parent | acbcd5f5b5465b28f966abd7f8da98062ba09935 (diff) | |
| download | upstream-c8d472c37f07e3a0d7a5ba05ec3b7538a72ad81c.tar.gz upstream-c8d472c37f07e3a0d7a5ba05ec3b7538a72ad81c.tar.bz2 upstream-c8d472c37f07e3a0d7a5ba05ec3b7538a72ad81c.zip | |
kernel: backport the ubiblock patches from 3.14->3.10
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41120
Diffstat (limited to 'target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch new file mode 100644 index 0000000000..75a0bc02ca --- /dev/null +++ b/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch @@ -0,0 +1,58 @@ +From eea9e1785e4c05c2a3444506aabafa0ae958538f Mon Sep 17 00:00:00 2001 +From: Daniel Golle <daniel@makrotopia.org> +Date: Sat, 17 May 2014 03:35:02 +0200 +Subject: [PATCH 4/5] try auto-mounting ubi0:rootfs in init/do_mounts.c +To: openwrt-devel@lists.openwrt.org + +Signed-off-by: Daniel Golle <daniel@makrotopia.org> +--- + init/do_mounts.c | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/init/do_mounts.c b/init/do_mounts.c +index 82f2288..faba9c6 100644 +--- a/init/do_mounts.c ++++ b/init/do_mounts.c +@@ -432,7 +432,27 @@ retry: + out: + put_page(page); + } +- ++ ++static int __init mount_ubi_rootfs(void) ++{ ++ int flags = MS_SILENT; ++ int err, tried = 0; ++ ++ while (tried < 2) { ++ err = do_mount_root("ubi0:rootfs", "ubifs", flags, \ ++ root_mount_data); ++ switch (err) { ++ case -EACCES: ++ flags |= MS_RDONLY; ++ tried++; ++ default: ++ return err; ++ } ++ } ++ ++ return -EINVAL; ++} ++ + #ifdef CONFIG_ROOT_NFS + + #define NFSROOT_TIMEOUT_MIN 5 +@@ -526,6 +546,10 @@ void __init mount_root(void) + change_floppy("root floppy"); + } + #endif ++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV ++ if (!mount_ubi_rootfs()) ++ return; ++#endif + #ifdef CONFIG_BLOCK + create_dev("/dev/root", ROOT_DEV); + mount_block_root("/dev/root", root_mountflags); +-- +1.9.2 + |