Unverified Commit 930e7c20 authored by Christian Brauner's avatar Christian Brauner
Browse files

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: default avatarChristian Brauner <brauner@kernel.org>
parents 989e0cdc a0851ea9

fs/jbd2/commit.c

+2 −2
Original line number Diff line number Diff line
@@ -772,9 +772,9 @@ void jbd2_journal_commit_transaction(journal_t *journal) 
	/*

	 * 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);

fs/jbd2/revoke.c

+1 −1
Original line number Diff line number Diff line
@@ -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