diff options
Diffstat (limited to 'target/linux/generic/pending-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch')
| -rw-r--r-- | target/linux/generic/pending-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/generic/pending-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch b/target/linux/generic/pending-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch new file mode 100644 index 0000000000..95de680989 --- /dev/null +++ b/target/linux/generic/pending-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch @@ -0,0 +1,32 @@ +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); + } + |