shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ext4: fix incorrect tid assumption in jbd2_journal_shrink_checkpoint_list()

Browse Source 
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@linux.dev>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240724161119.13448-4-luis.henriques@linux.dev
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Luis Henriques (SUSE)
2024-07-24 17:11:17 +01:00
committed by Greg Kroah-Hartman
parent 6d9fd7e74e
commit 354835cea9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/jbd2/checkpoint.c
View File

@@ -424,6 +424,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
tid_t tid = 0; tid_t tid = 0;
unsigned long nr_freed = 0; unsigned long nr_freed = 0;
unsigned long freed; unsigned long freed;
bool first_set = false;
again: again:
spin_lock(&journal->j_list_lock); spin_lock(&journal->j_list_lock);
@@ -443,8 +444,10 @@ again:
else else
transaction = journal->j_checkpoint_transactions; transaction = journal->j_checkpoint_transactions;
if (!first_tid) if (!first_set) {
first_tid = transaction->t_tid; first_tid = transaction->t_tid;
first_set = true;
}
last_transaction = journal->j_checkpoint_transactions->t_cpprev; last_transaction = journal->j_checkpoint_transactions->t_cpprev;
next_transaction = transaction; next_transaction = transaction;
last_tid = last_transaction->t_tid; last_tid = last_transaction->t_tid;
@@ -474,7 +477,7 @@ again:
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
cond_resched(); cond_resched();
if (*nr_to_scan && next_tid) if (*nr_to_scan && journal->j_shrink_transaction)
goto again; goto again;
out: out:
trace_jbd2_shrink_checkpoint_list(journal, first_tid, tid, last_tid, trace_jbd2_shrink_checkpoint_list(journal, first_tid, tid, last_tid,