mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-11 03:45:21 +02:00
jbd2: make jbd2_journal_get_max_txn_bufs() internal
commit 4aa99c71e4
upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
358bc85269
commit
7a8532b537
|
@ -767,7 +767,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);
|
||||||
|
|
|
@ -1690,6 +1690,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
|
||||||
|
|
|
@ -1666,11 +1666,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
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue
Block a user