From: Jan Kara <jack@suse.cz>
To: Fabian Frederick <fabf@skynet.be>
Cc: linux-kernel@vger.kernel.org, Jan Kara <jack@suse.cz>
Subject: Re: [PATCH 3/5 linux-next] udf: remove else after return in __load_block_bitmap()
Date: Sat, 14 Mar 2015 07:39:58 +0100 [thread overview]
Message-ID: <20150314063958.GC2888@quack.suse.cz> (raw)
In-Reply-To: <1426020276-13609-3-git-send-email-fabf@skynet.be>
On Tue 10-03-15 21:44:33, Fabian Frederick wrote:
> else after return is not needed.
Thanks. Applied to my tree.
Honza
>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
> ---
> fs/udf/balloc.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
> index 30f4641..1cd8916 100644
> --- a/fs/udf/balloc.c
> +++ b/fs/udf/balloc.c
> @@ -63,15 +63,14 @@ static int __load_block_bitmap(struct super_block *sb,
> block_group, nr_groups);
> }
>
> - if (bitmap->s_block_bitmap[block_group]) {
> + if (bitmap->s_block_bitmap[block_group])
> return block_group;
> - } else {
> - retval = read_block_bitmap(sb, bitmap, block_group,
> - block_group);
> - if (retval < 0)
> - return retval;
> - return block_group;
> - }
> +
> + retval = read_block_bitmap(sb, bitmap, block_group, block_group);
> + if (retval < 0)
> + return retval;
> +
> + return block_group;
> }
>
> static inline int load_block_bitmap(struct super_block *sb,
> --
> 1.9.1
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
next prev parent reply other threads:[~2015-03-14 6:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-10 20:44 [PATCH 1/5 linux-next] udf: remove unused variable in udf_table_free_blocks() Fabian Frederick
2015-03-10 20:44 ` [PATCH 2/5 linux-next] udf: use sector_t for udf_bitmap_prealloc_blocks() return value Fabian Frederick
2015-03-14 6:39 ` Jan Kara
2015-03-10 20:44 ` [PATCH 3/5 linux-next] udf: remove else after return in __load_block_bitmap() Fabian Frederick
2015-03-14 6:39 ` Jan Kara [this message]
2015-03-10 20:44 ` [PATCH 4/5 linux-next] udf: rename udf_get_filename() Fabian Frederick
2015-03-14 6:52 ` Jan Kara
2015-03-15 8:34 ` Fabian Frederick
2015-03-16 7:46 ` Jan Kara
2015-03-16 20:24 ` Fabian Frederick
2015-03-10 20:44 ` [PATCH 5/5 linux-next] udf: remove redundant buffer_head.h includes Fabian Frederick
2015-03-14 6:54 ` Jan Kara
2015-03-14 6:34 ` [PATCH 1/5 linux-next] udf: remove unused variable in udf_table_free_blocks() Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150314063958.GC2888@quack.suse.cz \
--to=jack@suse.cz \
--cc=fabf@skynet.be \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).