| Message ID | cacf72077e471632a52369656529df860961f0e1.1469588473.git.salah.triki@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 27/07/16 04:11, 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 dmesg to see that all functions entered and exited correctly. I prefer not removing that befs_debug(... ERROR ...); Unless anybody else agree this is a good patch. Thanks, Luis -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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(-)