1234567891011121314151617181920212223242526272829303132 |
- 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
- @@ -2116,8 +2116,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);
- }
-
|