mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
jbd2: correct the printing of write_flags in jbd2_write_superblock()
[ Upstream commit 8555922721
]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
1c187cb210
commit
2f601e8696
1 changed files with 3 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue