kevin/linux
1
Fork 0
Code

jbd2: make jbd2_journal_get_max_txn_bufs() internal

Browse Source 
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@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20240624170127.3253-1-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Jan Kara 2024-06-24 19:01:17 +02:00 committed by Theodore Ts'o
parent 0bab8db415
commit 4aa99c71e4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/jbd2/commit.c
View File

@ -766,7 +766,7 @@ start_journal_io:
if (first_block < journal->j_tail) if (first_block < journal->j_tail)
freed += journal->j_last - journal->j_first; freed += journal->j_last - journal->j_first;
/* Update tail only if we free significant amount of space */ /* 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; update_tail = 0;
} }
J_ASSERT(commit_transaction->t_state == T_COMMIT); J_ASSERT(commit_transaction->t_state == T_COMMIT);

5
fs/jbd2/journal.c
View File

@ -1674,6 +1674,11 @@ journal_t *jbd2_journal_init_inode(struct inode *inode)
return journal; 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 * Given a journal_t structure, initialise the various fields for
* startup of a new journaling session. We use this both when creating * startup of a new journaling session. We use this both when creating

5
include/linux/jbd2.h
View File

@ -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_wait_bufs(journal_t *journal, int num_blks);
int jbd2_fc_release_bufs(journal_t *journal); 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 * is_journal_abort
* *