Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 14:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ext4: fix incorrect tid assumption in ext4_wait_for_tail_page_commit()

Browse Source 
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
This commit is contained in:
Luis Henriques (SUSE) 2024-07-24 17:11:15 +01:00 committed by Theodore Ts'o
parent 7e8fb2eda9
commit dd589b0f14
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ext4/inode.c
View File

@ -5279,8 +5279,9 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
{ {
unsigned offset; unsigned offset;
journal_t *journal = EXT4_SB(inode->i_sb)->s_journal; journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
tid_t commit_tid = 0; tid_t commit_tid;
int ret; int ret;
bool has_transaction;
offset = inode->i_size & (PAGE_SIZE - 1); offset = inode->i_size & (PAGE_SIZE - 1);
/* /*
@ -5305,12 +5306,14 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
folio_put(folio); folio_put(folio);
if (ret != -EBUSY) if (ret != -EBUSY)
return; return;
commit_tid = 0; has_transaction = false;
read_lock(&journal->j_state_lock); read_lock(&journal->j_state_lock);
if (journal->j_committing_transaction) if (journal->j_committing_transaction) {
commit_tid = journal->j_committing_transaction->t_tid; commit_tid = journal->j_committing_transaction->t_tid;
has_transaction = true;
}
read_unlock(&journal->j_state_lock); read_unlock(&journal->j_state_lock);
if (commit_tid) if (has_transaction)
jbd2_log_wait_commit(journal, commit_tid); jbd2_log_wait_commit(journal, commit_tid);
} }
} }