jbd2: remove unneeded check of ret in jbd2_fc_get_buf

Simply return -EINVAL if j_fc_off is invalid to avoid repeated check of
ret.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20240801013815.2393869-9-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 7b78c0afa09f9a19213a4f33828cf8f9e3c3d11d..97f487c3d8fcf0aca61d43aeb3007d068a76963f 100644 (file)
--- 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;