From: Luis Henriques (SUSE) <luis.henriques@xxxxxxxxx> commit 7a6443e1dad70281f99f0bd394d7fd342481a632 upstream. Function jbd2_journal_shrink_checkpoint_list() assumes that '0' is not a valid value for transaction IDs, which is incorrect. Don't assume that and use two extra boolean variables to control the loop iterations and keep track of the first and last tid. Signed-off-by: Luis Henriques (SUSE) <luis.henriques@xxxxxxxxx> Reviewed-by: Jan Kara <jack@xxxxxxx> Link: https://patch.msgid.link/20240724161119.13448-4-luis.henriques@xxxxxxxxx Signed-off-by: Theodore Ts'o <tytso@xxxxxxx> Cc: stable@xxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/jbd2/checkpoint.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -424,6 +424,7 @@ unsigned long jbd2_journal_shrink_checkp tid_t tid = 0; unsigned long nr_freed = 0; unsigned long freed; + bool first_set = false; again: spin_lock(&journal->j_list_lock); @@ -443,8 +444,10 @@ again: else transaction = journal->j_checkpoint_transactions; - if (!first_tid) + if (!first_set) { first_tid = transaction->t_tid; + first_set = true; + } last_transaction = journal->j_checkpoint_transactions->t_cpprev; next_transaction = transaction; last_tid = last_transaction->t_tid; @@ -474,7 +477,7 @@ again: spin_unlock(&journal->j_list_lock); cond_resched(); - if (*nr_to_scan && next_tid) + if (*nr_to_scan && journal->j_shrink_transaction) goto again; out: trace_jbd2_shrink_checkpoint_list(journal, first_tid, tid, last_tid, Patches currently in stable-queue which might be from luis.henriques@xxxxxxxxx are queue-5.15/ext4-mark-fc-as-ineligible-using-an-handle-in-ext4_xattr_set.patch queue-5.15/ext4-fix-incorrect-tid-assumption-in-ext4_wait_for_tail_page_commit.patch queue-5.15/ext4-fix-fast-commit-inode-enqueueing-during-a-full-journal-commit.patch queue-5.15/ext4-fix-incorrect-tid-assumption-in-jbd2_journal_shrink_checkpoint_list.patch queue-5.15/ext4-fix-incorrect-tid-assumption-in-__jbd2_log_wait_for_space.patch queue-5.15/ext4-use-handle-to-mark-fc-as-ineligible-in-__track_dentry_update.patch
