diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index f858d1152368..540a3ccb3287 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -800,7 +800,7 @@ start_journal_io: 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 b7af1727a016..78163ef09cd2 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1529,6 +1529,11 @@ static void journal_fail_superblock(journal_t *journal) journal->j_sb_buffer = NULL; } +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 d19f527ade3b..5377df8c8545 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1669,11 +1669,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 *