| Message ID | 20160618155318.GA4285@makrotopia.org |
|---|---|
| State | Accepted |
| Delegated to: | Richard Weinberger |
| Headers | show |
Am 18.06.2016 um 17:53 schrieb Daniel Golle: > 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> > --- > v2: logic was accidentally inverted, fix that. > v3: add patch description > > 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); > } I'll queue this patch for v4.8. Thanks, //richard
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); }
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> --- v2: logic was accidentally inverted, fix that. v3: add patch description fs/ubifs/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)