jbd2: correct the printing of write_flags in jbd2_write_superblock()
authorZhang Yi <yi.zhang@huawei.com>
Wed, 29 Nov 2023 11:47:39 +0000 (19:47 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 1 Dec 2023 04:27:39 +0000 (23:27 -0500)
The write_flags print in the trace of jbd2_write_superblock() is not
real, so move the modification before the trace.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20231129114740.2686201-1-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/jbd2/journal.c

index ed53188472f9aa9949d1c3c6338cba01f725b79a..71b30f6a662dd2f9c3bed29da9fa905caf322979 100644 (file)
@@ -1798,9 +1798,11 @@ static int jbd2_write_superblock(journal_t *journal, blk_opf_t 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