From ef4e511a81fbc5cc0f2dde28c809721d4e6f9d45 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 12 Aug 2016 00:54:41 +0200 Subject: kernel: replace cosmetic UBIFS patches with what went upstream Signed-off-by: Daniel Golle --- ...s-silence-error-output-if-MS_SILENT-is-set.patch | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch') 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 ee679fa755..74418f0c90 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 -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 , - Richard Weinberger +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 +[rw: massaged commit message] +Signed-off-by: Richard Weinberger --- 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)) { -- cgit v1.2.3