Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1407248 > unrolled thread

[PATCH 1/2] fs: befs: Move useless assignment

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/2] fs: befs: Move useless assignment Salah Triki <salah.triki@acm.org> - 2016-05-26 00:00 +0200
    [PATCH 2/2] fs: befs: Check silent flag before logging errors Salah Triki <salah.triki@acm.org> - 2016-05-26 00:00 +0200
      Re: [PATCH 2/2] fs: befs: Check silent flag before logging errors Joe Perches <joe@perches.com> - 2016-05-26 01:10 +0200

#1407248 — [PATCH 1/2] fs: befs: Move useless assignment

Control is transfered to unacquire_none when sb->s_fs_info is equal to NULL,
so the assignment to NULL is useless and it is moved above unacquire_none.

Signed-off-by: Salah Triki <salah.triki@acm.org>
---
 fs/befs/linuxvfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 7da05b1..75ec9a7 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -870,9 +870,9 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
       unacquire_priv_sbp:
 	kfree(befs_sb->mount_opts.iocharset);
 	kfree(sb->s_fs_info);
+	sb->s_fs_info = NULL;
 
       unacquire_none:
-	sb->s_fs_info = NULL;
 	return ret;
 }
 
-- 
1.9.1

[toc] | [next] | [standalone]

#1407250 — [PATCH 2/2] fs: befs: Check silent flag before logging errors

Log errors only when silent flag is not set.

Signed-off-by: Salah Triki <salah.triki@acm.org>
---
 fs/befs/linuxvfs.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 75ec9a7..5b30d1f 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -765,14 +765,16 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
 
 	sb->s_fs_info = kzalloc(sizeof(*befs_sb), GFP_KERNEL);
 	if (sb->s_fs_info == NULL) {
-		pr_err("(%s): Unable to allocate memory for private "
-		       "portion of superblock. Bailing.\n", sb->s_id);
+		if (!silent)
+			pr_err("(%s): Unable to allocate memory for private "
+				"portion of superblock. Bailing.\n", sb->s_id);
 		goto unacquire_none;
 	}
 	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 +798,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 +823,10 @@ 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 +845,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;
 	}
 
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1407282 — Re: [PATCH 2/2] fs: befs: Check silent flag before logging errors

On Wed, 2016-05-25 at 22:58 +0100, Salah Triki wrote:
> Log errors only when silent flag is not set.
[]
> diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
[]
> @@ -765,14 +765,16 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
>  
>  	sb->s_fs_info = kzalloc(sizeof(*befs_sb), GFP_KERNEL);
>  	if (sb->s_fs_info == NULL) {
> -		pr_err("(%s): Unable to allocate memory for private "
> -		       "portion of superblock. Bailing.\n", sb->s_id);
> +		if (!silent)
> +			pr_err("(%s): Unable to allocate memory for private "
> +				"portion of superblock. Bailing.\n", sb->s_id);

Might as well remove this pr_err instead as
there's already a generic OOM and stack dump.

> @@ -820,9 +823,10 @@ 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);

Coalesce format too?

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web