On 2024/7/31 17:29, Kemeng Shi wrote:
> Simply return -EINVAL if j_fc_off is invalid to avoid repeated check of
> ret.
>
> Signed-off-by: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx>
> Reviewed-by: Jan Kara <jack@xxxxxxx>
Thanks, looks good to me.
Reviewed-by: Zhang Yi <yi.zhang@xxxxxxxxxx>
> ---
> fs/jbd2/journal.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index e89d777ded34..c5179aa38111 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -837,17 +837,12 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out)
>
> *bh_out = NULL;
>
> - if (journal->j_fc_off + journal->j_fc_first < journal->j_fc_last) {
> - fc_off = journal->j_fc_off;
> - blocknr = journal->j_fc_first + fc_off;
> - journal->j_fc_off++;
> - } else {
> - ret = -EINVAL;
> - }
> -
> - if (ret)
> - return ret;
> + if (journal->j_fc_off + journal->j_fc_first >= journal->j_fc_last)
> + return -EINVAL;
>
> + fc_off = journal->j_fc_off;
> + blocknr = journal->j_fc_first + fc_off;
> + journal->j_fc_off++;
> ret = jbd2_journal_bmap(journal, blocknr, &pblock);
> if (ret)
> return ret;
> @@ -856,7 +851,6 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out)
> if (!bh)
> return -ENOMEM;
>
> -
> journal->j_fc_wbuf[fc_off] = bh;
>
> *bh_out = bh;
>
