]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
fs/befs/linuxvfs.c: check silent flag before logging errors
authorSalah Triki <salah.triki@acm.org>
Sat, 23 Jul 2016 12:36:41 +0000 (22:36 +1000)
committerLuis de Bethencourt <luisbg@osg.samsung.com>
Sat, 8 Oct 2016 09:01:08 +0000 (10:01 +0100)
Log errors only when silent flag is not set.

Link: http://lkml.kernel.org/r/d400aaf5a7430de79bd956e40ec075fb1cb08474.1464226521.git.salah.triki@acm.org
Signed-off-by: Salah Triki <salah.triki@acm.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/befs/linuxvfs.c

index 75ec9a74d8ffa615071c76726d0f8df9331aa9e8..edee857c2b084c188986a536f5ebf13f20abfe3f 100644 (file)
@@ -772,7 +772,8 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
        befs_sb = BEFS_SB(sb);
 
        if (!parse_options((char *) data, &befs_sb->mount_opts)) {
-               befs_error(sb, "cannot parse mount options");
+               if (!silent)
+                       befs_error(sb, "cannot parse mount options");
                goto unacquire_priv_sbp;
        }
 
@@ -796,7 +797,8 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
        sb_min_blocksize(sb, 1024);
 
        if (!(bh = sb_bread(sb, sb_block))) {
-               befs_error(sb, "unable to read superblock");
+               if (!silent)
+                       befs_error(sb, "unable to read superblock");
                goto unacquire_priv_sbp;
        }
 
@@ -820,9 +822,9 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
        brelse(bh);
 
        if( befs_sb->num_blocks > ~((sector_t)0) ) {
-               befs_error(sb, "blocks count: %llu "
-                       "is larger than the host can use",
-                       befs_sb->num_blocks);
+               if (!silent)
+                       befs_error(sb, "blocks count: %llu is larger than the host can use",
+                                       befs_sb->num_blocks);
                goto unacquire_priv_sbp;
        }
 
@@ -841,7 +843,8 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
        }
        sb->s_root = d_make_root(root);
        if (!sb->s_root) {
-               befs_error(sb, "get root inode failed");
+               if (!silent)
+                       befs_error(sb, "get root inode failed");
                goto unacquire_priv_sbp;
        }