summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorZhang Yi <yi.zhang@huawei.com>2023-11-29 19:47:39 +0800
committerTheodore Ts'o <tytso@mit.edu>2023-11-30 23:27:39 -0500
commit85559227211020b270728104c3b89918f7af27ac (patch)
tree3e6f8d6369cf410089261553a9a790da0949648c /fs/jbd2
parent2dcf5fde6dffb312a4bfb8ef940cea2d1f402e32 (diff)
downloadlinux-85559227211020b270728104c3b89918f7af27ac.tar.gz
linux-85559227211020b270728104c3b89918f7af27ac.tar.bz2
linux-85559227211020b270728104c3b89918f7af27ac.zip
jbd2: correct the printing of write_flags in jbd2_write_superblock()
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>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/journal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index ed53188472f9..71b30f6a662d 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -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