diff options
| author | John Crispin <john@openwrt.org> | 2014-06-26 13:47:46 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-06-26 13:47:46 +0000 |
| commit | fbf8b288e1f318cb697f4a86cbe01b4b9573b82d (patch) | |
| tree | b955ff887aea2a971b9f6a69c12330b085791107 /target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch | |
| parent | 994e5ce2f93bf8beeb099a9fd38d1dc358005c30 (diff) | |
| download | upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.tar.gz upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.tar.bz2 upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.zip | |
kernel: refresh generic patches
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41352
Diffstat (limited to 'target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch b/target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch index 8f7df0d433..85dd8f0c19 100644 --- a/target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch +++ b/target/linux/generic/patches-3.10/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) +@@ -1164,6 +1164,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) +@@ -1229,6 +1232,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 @@ |