Skip to content

Commit 930e7c2

Browse files
committed
Merge patch series "jbd2: two straightforward fixes"
Two simple fixes for jdb2. * patches from https://lore.kernel.org/r/[email protected]: jbd2: flush filesystem device before updating tail sequence jbd2: increase IO priority for writing revoke records Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christian Brauner <[email protected]>
2 parents 989e0cd + a0851ea commit 930e7c2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

fs/jbd2/commit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,9 +772,9 @@ void jbd2_journal_commit_transaction(journal_t *journal)
772772
/*
773773
* If the journal is not located on the file system device,
774774
* then we must flush the file system device before we issue
775-
* the commit record
775+
* the commit record and update the journal tail sequence.
776776
*/
777-
if (commit_transaction->t_need_data_flush &&
777+
if ((commit_transaction->t_need_data_flush || update_tail) &&
778778
(journal->j_fs_dev != journal->j_dev) &&
779779
(journal->j_flags & JBD2_BARRIER))
780780
blkdev_issue_flush(journal->j_fs_dev);

fs/jbd2/revoke.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ static void flush_descriptor(journal_t *journal,
654654
set_buffer_jwrite(descriptor);
655655
BUFFER_TRACE(descriptor, "write");
656656
set_buffer_dirty(descriptor);
657-
write_dirty_buffer(descriptor, REQ_SYNC);
657+
write_dirty_buffer(descriptor, JBD2_JOURNAL_REQ_FLAGS);
658658
}
659659
#endif
660660

0 commit comments

Comments
 (0)