diff options
| author | Christian Brauner <brauner@kernel.org> | 2024-12-04 12:00:12 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-12-04 12:00:12 +0100 |
| commit | 930e7c209b77a9006db9590320e8dea5aa433c81 (patch) | |
| tree | 2a5bc7c5e39801a39e7de76cde586e6f32828d05 | |
| parent | 989e0cdc0f18a594b25cabc60426d29659aeaf58 (diff) | |
| parent | a0851ea9cd555c333795b85ddd908898b937c4e1 (diff) | |
Merge patch series "jbd2: two straightforward fixes"
Two simple fixes for jdb2.
* patches from https://lore.kernel.org/r/20241203014407.805916-1-yi.zhang@huaweicloud.com:
jbd2: flush filesystem device before updating tail sequence
jbd2: increase IO priority for writing revoke records
Link: https://lore.kernel.org/r/20241203014407.805916-1-yi.zhang@huaweicloud.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/jbd2/commit.c | 4 | ||||
| -rw-r--r-- | fs/jbd2/revoke.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 9153ff3a08e7..e8e80761ac73 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -772,9 +772,9 @@ start_journal_io: /* * If the journal is not located on the file system device, * then we must flush the file system device before we issue - * the commit record + * the commit record and update the journal tail sequence. */ - if (commit_transaction->t_need_data_flush && + if ((commit_transaction->t_need_data_flush || update_tail) && (journal->j_fs_dev != journal->j_dev) && (journal->j_flags & JBD2_BARRIER)) blkdev_issue_flush(journal->j_fs_dev); diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 4556e4689024..ce63d5fde9c3 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c @@ -654,7 +654,7 @@ static void flush_descriptor(journal_t *journal, set_buffer_jwrite(descriptor); BUFFER_TRACE(descriptor, "write"); set_buffer_dirty(descriptor); - write_dirty_buffer(descriptor, REQ_SYNC); + write_dirty_buffer(descriptor, JBD2_JOURNAL_REQ_FLAGS); } #endif |