Skip to content

Commit 80dccb8

Browse files
Luis Henriques (SUSE)gregkh
authored andcommitted
ext4: fix incorrect tid assumption in ext4_wait_for_tail_page_commit()
commit dd589b0 upstream. Function ext4_wait_for_tail_page_commit() 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-2-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>
1 parent f55ecc5 commit 80dccb8

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

fs/ext4/inode.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5257,8 +5257,9 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
52575257
{
52585258
unsigned offset;
52595259
journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
5260-
tid_t commit_tid = 0;
5260+
tid_t commit_tid;
52615261
int ret;
5262+
bool has_transaction;
52625263

52635264
offset = inode->i_size & (PAGE_SIZE - 1);
52645265
/*
@@ -5283,12 +5284,14 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
52835284
folio_put(folio);
52845285
if (ret != -EBUSY)
52855286
return;
5286-
commit_tid = 0;
5287+
has_transaction = false;
52875288
read_lock(&journal->j_state_lock);
5288-
if (journal->j_committing_transaction)
5289+
if (journal->j_committing_transaction) {
52895290
commit_tid = journal->j_committing_transaction->t_tid;
5291+
has_transaction = true;
5292+
}
52905293
read_unlock(&journal->j_state_lock);
5291-
if (commit_tid)
5294+
if (has_transaction)
52925295
jbd2_log_wait_commit(journal, commit_tid);
52935296
}
52945297
}

0 commit comments

Comments
 (0)