mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 21:44:27 -04:00
8072264b96
Refresh patches for all targets that support kernel 4.4. Compile-tested on all targets that use kernel 4.4 and aren't marked broken. Runtime-tested on ar71xx, octeon and x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 1ae92642e5900316011736072b4fa91710840620 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Sat, 18 Jun 2016 17:53:45 +0200
|
|
Subject: [PATCH] ubifs: Silence error output if MS_SILENT is set
|
|
|
|
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
|
|
*/
|
|
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);
|
|
}
|
|
|