mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

kernel: backport cosmetic ubifs patch

Browse Source 
Despite the MS_SILENT flag being set when probing for ubifs rootfs a
logline indicating an error is generated during boot:
UBIFS error (pid: 1): cannot open "ubi0:rootfs", error -19
This leads to confusion and there shouldn't be lines containing
the word 'error' twice in a bootlog if actually everything is fine
(just the rootfs happens to be something else than ubifs)

The patch added has been submitted and was accepted upstream, see:
http://lists.infradead.org/pipermail/linux-mtd/2016-June/068056.html
http://patchwork.ozlabs.org/patch/637491

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2016-06-18 18:34:22 +02:00
parent 982108f7e5
commit 67475b0e31
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch Normal file
View File

@ -0,0 +1,42 @@
From 6da56ec248e48c9c78721f51528c178adec3b35b Mon Sep 17 00:00:00 2001
In-Reply-To: <5765615E.5010409@nod.at>
References: <5765615E.5010409@nod.at>
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>
This change completes
commit 90bea5a3f0bf680b87b90516f3c231997f4b8f3b
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>
---
fs/ubifs/super.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 7034995..736dd58 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -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)) {
- pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d",
- current->pid, name, (int)PTR_ERR(ubi));
+ if (!(flags & MS_SILENT))
+ pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d",
+ current->pid, name, (int)PTR_ERR(ubi));
return ERR_CAST(ubi);
}
--
2.8.3