From: Wenjie Cheng Date: Fri, 14 Jun 2024 00:48:41 +0000 (+0000) Subject: Revert "f2fs: use flush command instead of FUA for zoned device" X-Git-Tag: v6.12-rc1~59^2~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c;p=thirdparty%2Fkernel%2Flinux.git Revert "f2fs: use flush command instead of FUA for zoned device" This reverts commit c550e25bca660ed2554cbb48d32b82d0bb98e4b1. Commit c550e25bca660ed2554cbb48d32b82d0bb98e4b1 ("f2fs: use flush command instead of FUA for zoned device") used additional flush command to keep write order. Since Commit dd291d77cc90eb6a86e9860ba8e6e38eebd57d12 ("block: Introduce zone write plugging") has enabled the block layer to handle this order issue, there is no need to use flush command. Signed-off-by: Wenjie Cheng Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index a458eb080198e..a7a3e6ac7f681 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -375,8 +375,7 @@ sync_nodes: f2fs_remove_ino_entry(sbi, ino, APPEND_INO); clear_inode_flag(inode, FI_APPEND_WRITE); flush_out: - if ((!atomic && F2FS_OPTION(sbi).fsync_mode != FSYNC_MODE_NOBARRIER) || - (atomic && !test_opt(sbi, NOBARRIER) && f2fs_sb_has_blkzoned(sbi))) + if (!atomic && F2FS_OPTION(sbi).fsync_mode != FSYNC_MODE_NOBARRIER) ret = f2fs_issue_flush(sbi, inode->i_ino); if (!ret) { f2fs_remove_ino_entry(sbi, ino, UPDATE_INO); diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 58721a55f1734..2fe182f735995 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1674,7 +1674,7 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted, goto redirty_out; } - if (atomic && !test_opt(sbi, NOBARRIER) && !f2fs_sb_has_blkzoned(sbi)) + if (atomic && !test_opt(sbi, NOBARRIER)) fio.op_flags |= REQ_PREFLUSH | REQ_FUA; /* should add to global list before clearing PAGECACHE status */