diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2016-06-18 18:53:45 +0300 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2016-07-29 17:17:50 +0300 |
| commit | 1ae92642e5900316011736072b4fa91710840620 (patch) | |
| tree | c5a9971b80ba91c93875c9bd3c9cc3a01d61ad63 /fs | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
| download | linux-1ae92642e5900316011736072b4fa91710840620.tar.xz | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/super.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 70349954e78b..736dd5842f46 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); } |