lkml.org 
[lkml]   [2016]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4/4] fs: befs: Remove goto from befs_bread_iaddr
On 02/07/16 09:05, Salah Triki wrote:
> Since goto statement merely returns NULL, replace it with return
> statement.
>
> Signed-off-by: Salah Triki <salah.triki@gmail.com>
> ---
> fs/befs/io.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/fs/befs/io.c b/fs/befs/io.c
> index 4223b77..af631a6 100644
> --- a/fs/befs/io.c
> +++ b/fs/befs/io.c
> @@ -37,7 +37,7 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr)
> if (iaddr.allocation_group > befs_sb->num_ags) {
> befs_error(sb, "BEFS: Invalid allocation group %u, max is %u",
> iaddr.allocation_group, befs_sb->num_ags);
> - goto error;
> + return NULL;
> }
>
> block = iaddr2blockno(sb, &iaddr);
> @@ -49,13 +49,9 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr)
> if (bh == NULL) {
> befs_error(sb, "Failed to read block %lu",
> (unsigned long)block);
> - goto error;
> + return NULL;
> }
>
> befs_debug(sb, "<--- %s", __func__);
> return bh;
> -
> - error:
> - befs_debug(sb, "<--- %s ERROR", __func__);
> - return NULL;
> }
>

Hi Salah,

The goto statement also calls the debug function. I know it doesn't look pretty
to have "debug; return; label; debug; return;", but I find these debug calls at
the start and end of functions very useful when reading the log to familiarize
myself with the code or test a change.

An alternative in this case would be to add the function name to the error messages
just before those goto errors. But I don't think that would be better than the
current code.

Just as a heads up there are 2 similar cases to this in fs/befs/btree.c
error:
befs_debug(sb, "<--- %s ERROR", __func__);
return BEFS_ERR;

Thanks,
Luis

\
 
 \ /
  Last update: 2016-07-02 14:41    [W:0.079 / U:18.868 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site