Commit 6140ceb9 authored by Kemeng Shi's avatar Kemeng Shi Committed by Theodore Ts'o
Browse files

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: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20240801013815.2393869-9-shikemeng@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 1862304b

fs/jbd2/journal.c

+5 −11
Original line number Diff line number Diff line
@@ -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) {

	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++;

	} else {

		ret = -EINVAL;

	}



	if (ret)

		return ret;



	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;