diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-06-24 12:27:36 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-06-24 12:27:36 +0000 |
| commit | 70a27a518e842f0180271ab79e058c3d20821bc7 (patch) | |
| tree | abc946786bdc65802d7b5e8bcdc11d4195b9c498 /target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch | |
| parent | 2dd6d4a4f06f1dea95c2e2de5c0dc668237cec71 (diff) | |
| download | upstream-70a27a518e842f0180271ab79e058c3d20821bc7.tar.gz upstream-70a27a518e842f0180271ab79e058c3d20821bc7.tar.bz2 upstream-70a27a518e842f0180271ab79e058c3d20821bc7.zip | |
kernel: update 3.14 to 3.14.8
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 41309
Diffstat (limited to 'target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch b/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch index 8f7df0d433..2e43d251dc 100644 --- a/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch +++ b/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch @@ -22,11 +22,9 @@ Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> --- -diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c -index e18b988..2290d58 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c -@@ -988,30 +988,32 @@ int ubifs_read_node(const struct ubifs_info *c, void *buf, int type, int len, +@@ -988,30 +988,32 @@ int ubifs_read_node(const struct ubifs_i return err; if (type != ch->node_type) { @@ -67,11 +65,9 @@ index e18b988..2290d58 100644 return -EINVAL; } -diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c -index a81c7b5..3904c85 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c -@@ -1149,6 +1149,9 @@ static int mount_ubifs(struct ubifs_info *c) +@@ -1149,6 +1149,9 @@ static int mount_ubifs(struct ubifs_info size_t sz; c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY); @@ -81,7 +77,7 @@ index a81c7b5..3904c85 100644 err = init_constants_early(c); if (err) return err; -@@ -1214,6 +1217,8 @@ static int mount_ubifs(struct ubifs_info *c) +@@ -1214,6 +1217,8 @@ static int mount_ubifs(struct ubifs_info if (err) goto out_free; @@ -90,8 +86,6 @@ index a81c7b5..3904c85 100644 /* * Make sure the compressor which is set as default in the superblock * or overridden by mount options is actually compiled in. -diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h -index e8c8cfe..c1f71fe 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -51,6 +51,15 @@ |