summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSalah Triki <salah.triki@acm.org>2016-07-23 22:36:41 +1000
committerLuis de Bethencourt <luisbg@osg.samsung.com>2016-10-08 10:01:08 +0100
commitdceee2e230e07d25e50478dde3f0621a1381da53 (patch)
treec933793c5405809b5fe8ff2a7311da9f8d622edd /fs
parent30982583e4e57c4648fee4a4d6511e23b6e5db2b (diff)
downloadop-kernel-dev-dceee2e230e07d25e50478dde3f0621a1381da53.zip
op-kernel-dev-dceee2e230e07d25e50478dde3f0621a1381da53.tar.gz
fs/befs/linuxvfs.c: check silent flag before logging errors
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/befs/linuxvfs.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 75ec9a7..edee857 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -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;
}
OpenPOWER on IntegriCloud