hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jbd2: Drop jbd2_space_needed()

Browse Source 
The function is now just a trivial wrapper returning
journal->j_max_transaction_buffers. Drop it.

Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20191105164437.32602-19-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Jan Kara 2019-11-05 17:44:25 +01:00 committed by Theodore Ts'o
parent 9f356e5a4f
commit 77444ac4f9
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/jbd2/checkpoint.c
View File

@ -110,7 +110,7 @@ void __jbd2_log_wait_for_space(journal_t *journal)
int nblocks, space_left; int nblocks, space_left;
/* assert_spin_locked(&journal->j_state_lock); */ /* assert_spin_locked(&journal->j_state_lock); */
nblocks = jbd2_space_needed(journal); nblocks = journal->j_max_transaction_buffers;
while (jbd2_log_space_left(journal) < nblocks) { while (jbd2_log_space_left(journal) < nblocks) {
write_unlock(&journal->j_state_lock); write_unlock(&journal->j_state_lock);
mutex_lock_io(&journal->j_checkpoint_mutex); mutex_lock_io(&journal->j_checkpoint_mutex);

5
fs/jbd2/transaction.c
View File

@ -270,12 +270,13 @@ static int add_transaction_credits(journal_t *journal, int blocks,
* *before* starting to dirty potentially checkpointed buffers * *before* starting to dirty potentially checkpointed buffers
* in the new transaction. * in the new transaction.
*/ */
if (jbd2_log_space_left(journal) < jbd2_space_needed(journal)) { if (jbd2_log_space_left(journal) < journal->j_max_transaction_buffers) {
atomic_sub(total, &t->t_outstanding_credits); atomic_sub(total, &t->t_outstanding_credits);
read_unlock(&journal->j_state_lock); read_unlock(&journal->j_state_lock);
jbd2_might_wait_for_commit(journal); jbd2_might_wait_for_commit(journal);
write_lock(&journal->j_state_lock); write_lock(&journal->j_state_lock);
if (jbd2_log_space_left(journal) < jbd2_space_needed(journal)) if (jbd2_log_space_left(journal) <
journal->j_max_transaction_buffers)
__jbd2_log_wait_for_space(journal); __jbd2_log_wait_for_space(journal);
write_unlock(&journal->j_state_lock); write_unlock(&journal->j_state_lock);
return 1; return 1;

9
include/linux/jbd2.h
View File

@ -1562,15 +1562,6 @@ static inline int jbd2_journal_has_csum_v2or3(journal_t *journal)
return journal->j_chksum_driver != NULL; return journal->j_chksum_driver != NULL;
} }
/*
* Return the minimum number of blocks which must be free in the journal
* before a new transaction may be started. Must be called under j_state_lock.
*/
static inline int jbd2_space_needed(journal_t *journal)
{
return journal->j_max_transaction_buffers;
}
/* /*
* Return number of free blocks in the log. Must be called under j_state_lock. * Return number of free blocks in the log. Must be called under j_state_lock.
*/ */