On 2024/6/25 1:01, Jan Kara wrote:
> There's no reason to have jbd2_journal_get_max_txn_bufs() public
> function. Currently all users are internal and can use
> journal->j_max_transaction_buffers instead. This saves some unnecessary
> recomputations of the limit as a bonus which becomes important as this
> function gets more complex in the following patch.
>
> CC: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Jan Kara <jack@xxxxxxx>
A good cleanup.
Reviewed-by: Zhang Yi <yi.zhang@xxxxxxxxxx>
> ---
> fs/jbd2/commit.c | 2 +-
> fs/jbd2/journal.c | 5 +++++
> include/linux/jbd2.h | 5 -----
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
> index 75ea4e9a5cab..e7fc912693bd 100644
> --- a/fs/jbd2/commit.c
> +++ b/fs/jbd2/commit.c
> @@ -766,7 +766,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
> if (first_block < journal->j_tail)
> freed += journal->j_last - journal->j_first;
> /* Update tail only if we free significant amount of space */
> - if (freed < jbd2_journal_get_max_txn_bufs(journal))
> + if (freed < journal->j_max_transaction_buffers)
> update_tail = 0;
> }
> J_ASSERT(commit_transaction->t_state == T_COMMIT);
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index 03c4b9214f56..1bb73750d307 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -1698,6 +1698,11 @@ journal_t *jbd2_journal_init_inode(struct inode *inode)
> return journal;
> }
>
> +static int jbd2_journal_get_max_txn_bufs(journal_t *journal)
> +{
> + return (journal->j_total_len - journal->j_fc_wbufsize) / 4;
> +}
> +
> /*
> * Given a journal_t structure, initialise the various fields for
> * startup of a new journaling session. We use this both when creating
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index ab04c1c27fae..f91b930abe20 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -1660,11 +1660,6 @@ int jbd2_wait_inode_data(journal_t *journal, struct jbd2_inode *jinode);
> int jbd2_fc_wait_bufs(journal_t *journal, int num_blks);
> int jbd2_fc_release_bufs(journal_t *journal);
>
> -static inline int jbd2_journal_get_max_txn_bufs(journal_t *journal)
> -{
> - return (journal->j_total_len - journal->j_fc_wbufsize) / 4;
> -}
> -
> /*
> * is_journal_abort
> *
>
