From: Greg Kroah-Hartman Date: Wed, 2 Oct 2024 09:53:49 +0000 (+0200) Subject: drop f2fs revert X-Git-Tag: v6.6.54~41 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a55526441593dff463bcdaa54c0f19ed51070516;p=thirdparty%2Fkernel%2Fstable-queue.git drop f2fs revert --- diff --git a/queue-6.1/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch b/queue-6.1/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch index f44996dfbae..b38b3ff6ad7 100644 --- a/queue-6.1/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch +++ b/queue-6.1/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman stat_inc_largest_node_hit(sbi); --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2670,7 +2670,7 @@ static int f2fs_defragment_range(struct +@@ -2671,7 +2671,7 @@ static int f2fs_defragment_range(struct * block addresses are continuous. */ if (f2fs_lookup_read_extent_cache(inode, pg_start, &ei)) { diff --git a/queue-6.1/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch b/queue-6.1/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch index 1593dcd491f..162031dc1b5 100644 --- a/queue-6.1/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch +++ b/queue-6.1/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2647,7 +2647,8 @@ static int f2fs_defragment_range(struct +@@ -2648,7 +2648,8 @@ static int f2fs_defragment_range(struct inode_lock(inode); @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman err = -EINVAL; goto unlock_out; } -@@ -2877,6 +2878,11 @@ static int f2fs_move_file_range(struct f +@@ -2878,6 +2879,11 @@ static int f2fs_move_file_range(struct f goto out_unlock; } @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman ret = -EINVAL; if (pos_in + len > src->i_size || pos_in + len < pos_in) goto out_unlock; -@@ -3248,6 +3254,11 @@ static int f2fs_ioc_set_pin_file(struct +@@ -3249,6 +3255,11 @@ static int f2fs_ioc_set_pin_file(struct inode_lock(inode); diff --git a/queue-6.1/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch b/queue-6.1/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch deleted file mode 100644 index 93528b1ba67..00000000000 --- a/queue-6.1/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c Mon Sep 17 00:00:00 2001 -From: Wenjie Cheng -Date: Fri, 14 Jun 2024 00:48:41 +0000 -Subject: Revert "f2fs: use flush command instead of FUA for zoned device" - -From: Wenjie Cheng - -commit b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c upstream. - -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 -Signed-off-by: Greg Kroah-Hartman ---- - fs/f2fs/file.c | 3 +-- - fs/f2fs/node.c | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - ---- 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); ---- a/fs/f2fs/node.c -+++ b/fs/f2fs/node.c -@@ -1648,7 +1648,7 @@ static int __write_node_page(struct page - 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 */ diff --git a/queue-6.1/series b/queue-6.1/series index df257ca92a4..f6402b87201 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -294,7 +294,6 @@ pci-imx6-fix-missing-call-to-phy_power_off-in-error-handling.patch pci-xilinx-nwl-fix-off-by-one-in-intx-irq-handler.patch asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch -revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch revert-media-tuners-fix-error-return-code-of-hybrid_tuner_request_state.patch input-adp5588-keys-fix-check-on-return-code.patch input-i8042-add-tuxedo-stellaris-16-gen5-amd-to-i8042-quirk-table.patch diff --git a/queue-6.10/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch b/queue-6.10/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch index eba713af0ba..c9a21ad72a8 100644 --- a/queue-6.10/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch +++ b/queue-6.10/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman stat_inc_largest_node_hit(sbi); --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2718,7 +2718,7 @@ static int f2fs_defragment_range(struct +@@ -2719,7 +2719,7 @@ static int f2fs_defragment_range(struct * block addresses are continuous. */ if (f2fs_lookup_read_extent_cache(inode, pg_start, &ei)) { diff --git a/queue-6.10/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch b/queue-6.10/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch index 69f54f070bc..3d2688bd99d 100644 --- a/queue-6.10/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch +++ b/queue-6.10/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2703,7 +2703,8 @@ static int f2fs_defragment_range(struct +@@ -2704,7 +2704,8 @@ static int f2fs_defragment_range(struct (range->start + range->len) >> PAGE_SHIFT, DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE)); @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman err = -EINVAL; goto unlock_out; } -@@ -2936,6 +2937,11 @@ static int f2fs_move_file_range(struct f +@@ -2937,6 +2938,11 @@ static int f2fs_move_file_range(struct f goto out_unlock; } @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman ret = -EINVAL; if (pos_in + len > src->i_size || pos_in + len < pos_in) goto out_unlock; -@@ -3319,6 +3325,11 @@ static int f2fs_ioc_set_pin_file(struct +@@ -3320,6 +3326,11 @@ static int f2fs_ioc_set_pin_file(struct inode_lock(inode); diff --git a/queue-6.10/f2fs-require-fmode_write-for-atomic-write-ioctls.patch b/queue-6.10/f2fs-require-fmode_write-for-atomic-write-ioctls.patch index 53d1f3a9a1f..34732482a18 100644 --- a/queue-6.10/f2fs-require-fmode_write-for-atomic-write-ioctls.patch +++ b/queue-6.10/f2fs-require-fmode_write-for-atomic-write-ioctls.patch @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2122,6 +2122,9 @@ static int f2fs_ioc_start_atomic_write(s +@@ -2123,6 +2123,9 @@ static int f2fs_ioc_start_atomic_write(s loff_t isize; int ret; @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman if (!inode_owner_or_capable(idmap, inode)) return -EACCES; -@@ -2229,6 +2232,9 @@ static int f2fs_ioc_commit_atomic_write( +@@ -2230,6 +2233,9 @@ static int f2fs_ioc_commit_atomic_write( struct mnt_idmap *idmap = file_mnt_idmap(filp); int ret; @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman if (!inode_owner_or_capable(idmap, inode)) return -EACCES; -@@ -2261,6 +2267,9 @@ static int f2fs_ioc_abort_atomic_write(s +@@ -2262,6 +2268,9 @@ static int f2fs_ioc_abort_atomic_write(s struct mnt_idmap *idmap = file_mnt_idmap(filp); int ret; diff --git a/queue-6.10/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch b/queue-6.10/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch deleted file mode 100644 index 8da3994bcb8..00000000000 --- a/queue-6.10/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c Mon Sep 17 00:00:00 2001 -From: Wenjie Cheng -Date: Fri, 14 Jun 2024 00:48:41 +0000 -Subject: Revert "f2fs: use flush command instead of FUA for zoned device" - -From: Wenjie Cheng - -commit b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c upstream. - -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 -Signed-off-by: Greg Kroah-Hartman ---- - fs/f2fs/file.c | 3 +-- - fs/f2fs/node.c | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - ---- a/fs/f2fs/file.c -+++ b/fs/f2fs/file.c -@@ -376,8 +376,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); ---- a/fs/f2fs/node.c -+++ b/fs/f2fs/node.c -@@ -1674,7 +1674,7 @@ static int __write_node_page(struct page - 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 */ diff --git a/queue-6.10/series b/queue-6.10/series index d8691fe1d5c..aa37c6408f5 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -475,7 +475,6 @@ asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch soc-fsl-cpm1-qmc-update-trnsync-only-in-transparent-mode.patch soc-fsl-cpm1-tsa-fix-tsa_write8.patch soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch -revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch revert-media-tuners-fix-error-return-code-of-hybrid_tuner_request_state.patch iommu-amd-fix-argument-order-in-amd_iommu_dev_flush_pasid_all.patch iommufd-protect-against-overflow-of-align-during-iova-allocation.patch diff --git a/queue-6.11/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch b/queue-6.11/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch index 44b3eb76a01..5557fb66020 100644 --- a/queue-6.11/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch +++ b/queue-6.11/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman stat_inc_largest_node_hit(sbi); --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2730,7 +2730,7 @@ static int f2fs_defragment_range(struct +@@ -2731,7 +2731,7 @@ static int f2fs_defragment_range(struct * block addresses are continuous. */ if (f2fs_lookup_read_extent_cache(inode, pg_start, &ei)) { diff --git a/queue-6.11/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch b/queue-6.11/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch index 20eb366b797..e1dc895c94c 100644 --- a/queue-6.11/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch +++ b/queue-6.11/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2715,7 +2715,8 @@ static int f2fs_defragment_range(struct +@@ -2716,7 +2716,8 @@ static int f2fs_defragment_range(struct (range->start + range->len) >> PAGE_SHIFT, DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE)); @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman err = -EINVAL; goto unlock_out; } -@@ -2948,6 +2949,11 @@ static int f2fs_move_file_range(struct f +@@ -2949,6 +2950,11 @@ static int f2fs_move_file_range(struct f goto out_unlock; } @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman ret = -EINVAL; if (pos_in + len > src->i_size || pos_in + len < pos_in) goto out_unlock; -@@ -3331,6 +3337,11 @@ static int f2fs_ioc_set_pin_file(struct +@@ -3332,6 +3338,11 @@ static int f2fs_ioc_set_pin_file(struct inode_lock(inode); diff --git a/queue-6.11/f2fs-fix-to-wait-dio-completion.patch b/queue-6.11/f2fs-fix-to-wait-dio-completion.patch index d021644a1c7..1016cbef39f 100644 --- a/queue-6.11/f2fs-fix-to-wait-dio-completion.patch +++ b/queue-6.11/f2fs-fix-to-wait-dio-completion.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -1054,6 +1054,13 @@ int f2fs_setattr(struct mnt_idmap *idmap +@@ -1055,6 +1055,13 @@ int f2fs_setattr(struct mnt_idmap *idmap return err; } @@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman f2fs_down_write(&fi->i_gc_rwsem[WRITE]); filemap_invalidate_lock(inode->i_mapping); -@@ -1890,6 +1897,12 @@ static long f2fs_fallocate(struct file * +@@ -1891,6 +1898,12 @@ static long f2fs_fallocate(struct file * if (ret) goto out; diff --git a/queue-6.11/f2fs-require-fmode_write-for-atomic-write-ioctls.patch b/queue-6.11/f2fs-require-fmode_write-for-atomic-write-ioctls.patch index 95d3bb6a5dd..30abfff5ff2 100644 --- a/queue-6.11/f2fs-require-fmode_write-for-atomic-write-ioctls.patch +++ b/queue-6.11/f2fs-require-fmode_write-for-atomic-write-ioctls.patch @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2134,6 +2134,9 @@ static int f2fs_ioc_start_atomic_write(s +@@ -2135,6 +2135,9 @@ static int f2fs_ioc_start_atomic_write(s loff_t isize; int ret; @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman if (!inode_owner_or_capable(idmap, inode)) return -EACCES; -@@ -2241,6 +2244,9 @@ static int f2fs_ioc_commit_atomic_write( +@@ -2242,6 +2245,9 @@ static int f2fs_ioc_commit_atomic_write( struct mnt_idmap *idmap = file_mnt_idmap(filp); int ret; @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman if (!inode_owner_or_capable(idmap, inode)) return -EACCES; -@@ -2273,6 +2279,9 @@ static int f2fs_ioc_abort_atomic_write(s +@@ -2274,6 +2280,9 @@ static int f2fs_ioc_abort_atomic_write(s struct mnt_idmap *idmap = file_mnt_idmap(filp); int ret; diff --git a/queue-6.11/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch b/queue-6.11/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch deleted file mode 100644 index 8da3994bcb8..00000000000 --- a/queue-6.11/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c Mon Sep 17 00:00:00 2001 -From: Wenjie Cheng -Date: Fri, 14 Jun 2024 00:48:41 +0000 -Subject: Revert "f2fs: use flush command instead of FUA for zoned device" - -From: Wenjie Cheng - -commit b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c upstream. - -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 -Signed-off-by: Greg Kroah-Hartman ---- - fs/f2fs/file.c | 3 +-- - fs/f2fs/node.c | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - ---- a/fs/f2fs/file.c -+++ b/fs/f2fs/file.c -@@ -376,8 +376,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); ---- a/fs/f2fs/node.c -+++ b/fs/f2fs/node.c -@@ -1674,7 +1674,7 @@ static int __write_node_page(struct page - 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 */ diff --git a/queue-6.11/series b/queue-6.11/series index a72f094f25f..b926dfdd93d 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -524,7 +524,6 @@ asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch soc-fsl-cpm1-qmc-update-trnsync-only-in-transparent-mode.patch soc-fsl-cpm1-tsa-fix-tsa_write8.patch soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch -revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch revert-media-tuners-fix-error-return-code-of-hybrid_tuner_request_state.patch iommu-amd-fix-argument-order-in-amd_iommu_dev_flush_pasid_all.patch iommufd-protect-against-overflow-of-align-during-iova-allocation.patch diff --git a/queue-6.6/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch b/queue-6.6/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch index 93ffdca7f80..5401f409ede 100644 --- a/queue-6.6/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch +++ b/queue-6.6/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman stat_inc_largest_node_hit(sbi); --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2686,7 +2686,7 @@ static int f2fs_defragment_range(struct +@@ -2687,7 +2687,7 @@ static int f2fs_defragment_range(struct * block addresses are continuous. */ if (f2fs_lookup_read_extent_cache(inode, pg_start, &ei)) { diff --git a/queue-6.6/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch b/queue-6.6/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch index 67dd24ce067..d40b0afbb56 100644 --- a/queue-6.6/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch +++ b/queue-6.6/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2672,7 +2672,8 @@ static int f2fs_defragment_range(struct +@@ -2673,7 +2673,8 @@ static int f2fs_defragment_range(struct inode_lock(inode); @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman err = -EINVAL; goto unlock_out; } -@@ -2903,6 +2904,11 @@ static int f2fs_move_file_range(struct f +@@ -2904,6 +2905,11 @@ static int f2fs_move_file_range(struct f goto out_unlock; } @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman ret = -EINVAL; if (pos_in + len > src->i_size || pos_in + len < pos_in) goto out_unlock; -@@ -3287,6 +3293,11 @@ static int f2fs_ioc_set_pin_file(struct +@@ -3288,6 +3294,11 @@ static int f2fs_ioc_set_pin_file(struct inode_lock(inode); diff --git a/queue-6.6/f2fs-require-fmode_write-for-atomic-write-ioctls.patch b/queue-6.6/f2fs-require-fmode_write-for-atomic-write-ioctls.patch index 82c4e1c347b..53bff6c5f3c 100644 --- a/queue-6.6/f2fs-require-fmode_write-for-atomic-write-ioctls.patch +++ b/queue-6.6/f2fs-require-fmode_write-for-atomic-write-ioctls.patch @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -2099,6 +2099,9 @@ static int f2fs_ioc_start_atomic_write(s +@@ -2100,6 +2100,9 @@ static int f2fs_ioc_start_atomic_write(s loff_t isize; int ret; @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman if (!inode_owner_or_capable(idmap, inode)) return -EACCES; -@@ -2205,6 +2208,9 @@ static int f2fs_ioc_commit_atomic_write( +@@ -2206,6 +2209,9 @@ static int f2fs_ioc_commit_atomic_write( struct mnt_idmap *idmap = file_mnt_idmap(filp); int ret; @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman if (!inode_owner_or_capable(idmap, inode)) return -EACCES; -@@ -2237,6 +2243,9 @@ static int f2fs_ioc_abort_atomic_write(s +@@ -2238,6 +2244,9 @@ static int f2fs_ioc_abort_atomic_write(s struct mnt_idmap *idmap = file_mnt_idmap(filp); int ret; diff --git a/queue-6.6/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch b/queue-6.6/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch deleted file mode 100644 index 677e4ded91b..00000000000 --- a/queue-6.6/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c Mon Sep 17 00:00:00 2001 -From: Wenjie Cheng -Date: Fri, 14 Jun 2024 00:48:41 +0000 -Subject: Revert "f2fs: use flush command instead of FUA for zoned device" - -From: Wenjie Cheng - -commit b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c upstream. - -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 -Signed-off-by: Greg Kroah-Hartman ---- - fs/f2fs/file.c | 3 +-- - fs/f2fs/node.c | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - ---- a/fs/f2fs/file.c -+++ b/fs/f2fs/file.c -@@ -371,8 +371,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); ---- a/fs/f2fs/node.c -+++ b/fs/f2fs/node.c -@@ -1664,7 +1664,7 @@ static int __write_node_page(struct page - 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 */ diff --git a/queue-6.6/series b/queue-6.6/series index 700094a4437..41c965c31de 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -401,7 +401,6 @@ revert-soc-qcom-smd-rpm-match-rpmsg-channel-instead-of-compatible.patch asoc-rt5682-return-devm_of_clk_add_hw_provider-to-transfer-the-error.patch soc-fsl-cpm1-tsa-fix-tsa_write8.patch soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch -revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch revert-media-tuners-fix-error-return-code-of-hybrid_tuner_request_state.patch iommufd-protect-against-overflow-of-align-during-iova-allocation.patch input-adp5588-keys-fix-check-on-return-code.patch