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

ext4: fix incorrect tid assumption in __jbd2_log_wait_for_space()

Browse Source 
commit 972090651ee15e51abfb2160e986fa050cfc7a40 upstream.

Function __jbd2_log_wait_for_space() assumes that '0' is not a valid value
for transaction IDs, which is incorrect.  Don't assume that and invoke
jbd2_log_wait_commit() if the journal had a committing transaction instead.

Signed-off-by: Luis Henriques (SUSE) <luis.henriques@linux.dev>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240724161119.13448-3-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:16 +01:00
committed by Greg Kroah-Hartman
parent abfaa876b9
commit bd87b99ef3
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

@@ -91,9 +91,12 @@ __releases(&journal->j_state_lock)
if (space_left < nblocks) { if (space_left < nblocks) {
int chkpt = journal->j_checkpoint_transactions != NULL; int chkpt = journal->j_checkpoint_transactions != NULL;
tid_t tid = 0; tid_t tid = 0;
bool has_transaction = false;
if (journal->j_committing_transaction) if (journal->j_committing_transaction) {
tid = journal->j_committing_transaction->t_tid; tid = journal->j_committing_transaction->t_tid;
has_transaction = true;
}
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
write_unlock(&journal->j_state_lock); write_unlock(&journal->j_state_lock);
if (chkpt) { if (chkpt) {
@@ -101,7 +104,7 @@ __releases(&journal->j_state_lock)
} else if (jbd2_cleanup_journal_tail(journal) == 0) { } else if (jbd2_cleanup_journal_tail(journal) == 0) {
/* We were able to recover space; yay! */ /* We were able to recover space; yay! */
; ;
} else if (tid) { } else if (has_transaction) {
/* /*
* jbd2_journal_commit_transaction() may want * jbd2_journal_commit_transaction() may want
* to take the checkpoint_mutex if JBD2_FLUSHED * to take the checkpoint_mutex if JBD2_FLUSHED