Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f601e86 authored by Zhang Yi's avatar Zhang Yi Committed by Greg Kroah-Hartman
Browse files

jbd2: correct the printing of write_flags in jbd2_write_superblock() 



[ Upstream commit 85559227211020b270728104c3b89918f7af27ac ]

The write_flags print in the trace of jbd2_write_superblock() is not
real, so move the modification before the trace.

Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20231129114740.2686201-1-yi.zhang@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1c187cb2

fs/jbd2/journal.c

+3 −1
Original line number Diff line number Diff line
@@ -1355,9 +1355,11 @@ static int jbd2_write_superblock(journal_t *journal, int write_flags) 
		return -EIO;

	}



	trace_jbd2_write_superblock(journal, write_flags);

	if (!(journal->j_flags & JBD2_BARRIER))

		write_flags &= ~(REQ_FUA | REQ_PREFLUSH);



	trace_jbd2_write_superblock(journal, write_flags);



	if (buffer_write_io_error(bh)) {

		/*

		 * Oh, dear.  A previous attempt to write the journal