Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[cascardo/linux.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index a81c7b5..3904c85 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1149,6 +1149,9 @@ static int mount_ubifs(struct ubifs_info *c)
        size_t sz;
 
        c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
+       /* Suppress error messages while probing if MS_SILENT is set */
+       c->probing = !!(c->vfs_sb->s_flags & MS_SILENT);
+
        err = init_constants_early(c);
        if (err)
                return err;
@@ -1214,6 +1217,8 @@ static int mount_ubifs(struct ubifs_info *c)
        if (err)
                goto out_free;
 
+       c->probing = 0;
+
        /*
         * Make sure the compressor which is set as default in the superblock
         * or overridden by mount options is actually compiled in.