summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2016-08-12 00:54:41 +0200
committerDaniel Golle <daniel@makrotopia.org>2016-08-19 17:53:50 +0200
commitef4e511a81fbc5cc0f2dde28c809721d4e6f9d45 (patch)
treef09c7a02314c02e42585d9d0e745a6a9b01b3357 /target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch
parent28d641be43a5acde4dc3ff49112852cb661fd41a (diff)
downloadmtk-20170518-ef4e511a81fbc5cc0f2dde28c809721d4e6f9d45.zip
mtk-20170518-ef4e511a81fbc5cc0f2dde28c809721d4e6f9d45.tar.gz
mtk-20170518-ef4e511a81fbc5cc0f2dde28c809721d4e6f9d45.tar.bz2
kernel: replace cosmetic UBIFS patches with what went upstream
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch')
-rw-r--r--target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch21
1 files changed, 8 insertions, 13 deletions
diff --git a/target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch b/target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch
index ee679fa..74418f0 100644
--- a/target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch
+++ b/target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch
@@ -1,29 +1,24 @@
-From 6da56ec248e48c9c78721f51528c178adec3b35b Mon Sep 17 00:00:00 2001
-In-Reply-To: <5765615E.5010409@nod.at>
-References: <5765615E.5010409@nod.at>
+From 1ae92642e5900316011736072b4fa91710840620 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
-Date: Sat, 18 Jun 2016 11:42:52 +0200
-Subject: [PATCH] ubifs: silence error output if MS_SILENT is set
-X-Patchwork-Id: 637491
-X-Patchwork-Delegate: richard.weinberger@gmail.com
-To: linux-mtd@lists.infradead.org
-Cc: Artem Bityutskiy <dedekind1@gmail.com>,
- Richard Weinberger <richard.weinberger@gmail.com>
+Date: Sat, 18 Jun 2016 17:53:45 +0200
+Subject: [PATCH] ubifs: Silence error output if MS_SILENT is set
-This change completes
-commit 90bea5a3f0bf680b87b90516f3c231997f4b8f3b
+This change completes commit
+90bea5a3f0 ("UBIFS: respect MS_SILENT mount flag")
which already implements support for MS_SILENT except for that one
error message which is still being displayed despite MS_SILENT being
set. Suppress that error message as well in case MS_SILENT is set.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+[rw: massaged commit message]
+Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/ubifs/super.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
-@@ -2107,8 +2107,9 @@ static struct dentry *ubifs_mount(struct
+@@ -2108,8 +2108,9 @@ static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags,
*/
ubi = open_ubi(name, UBI_READONLY);
if (IS_ERR(ubi)) {