aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
commit070d3b27c223f23a4793667264441f8c2f008755 (patch)
tree70118ffb38f5c0d059605e8a15e6edee87d21d22 /target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch
parentd11aefc8eb1faf362ac35712d8a1741768534580 (diff)
downloadupstream-070d3b27c223f23a4793667264441f8c2f008755.tar.gz
upstream-070d3b27c223f23a4793667264441f8c2f008755.tar.bz2
upstream-070d3b27c223f23a4793667264441f8c2f008755.zip
kernel: update 3.14 to 3.14.25
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43427
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.patch4
1 files changed, 2 insertions, 2 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 2e43d251dc..607efde7a3 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
@@ -104,7 +104,7 @@ Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
/* UBIFS file system VFS magic number */
#define UBIFS_SUPER_MAGIC 0x24051905
-@@ -1209,6 +1218,7 @@ struct ubifs_debug_info;
+@@ -1208,6 +1217,7 @@ struct ubifs_debug_info;
* @need_recovery: %1 if the file-system needs recovery
* @replaying: %1 during journal replay
* @mounting: %1 while mounting
@@ -112,7 +112,7 @@ Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
* @remounting_rw: %1 while re-mounting from R/O mode to R/W mode
* @replay_list: temporary list used during journal replay
* @replay_buds: list of buds to replay
-@@ -1441,6 +1451,7 @@ struct ubifs_info {
+@@ -1439,6 +1449,7 @@ struct ubifs_info {
unsigned int replaying:1;
unsigned int mounting:1;
unsigned int remounting_rw:1;