]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop f2fs revert
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Oct 2024 09:53:49 +0000 (11:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Oct 2024 09:53:49 +0000 (11:53 +0200)
20 files changed:
queue-6.1/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch
queue-6.1/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch
queue-6.1/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch [deleted file]
queue-6.1/series
queue-6.10/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch
queue-6.10/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch
queue-6.10/f2fs-require-fmode_write-for-atomic-write-ioctls.patch
queue-6.10/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch [deleted file]
queue-6.10/series
queue-6.11/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch
queue-6.11/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch
queue-6.11/f2fs-fix-to-wait-dio-completion.patch
queue-6.11/f2fs-require-fmode_write-for-atomic-write-ioctls.patch
queue-6.11/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch [deleted file]
queue-6.11/series
queue-6.6/f2fs-fix-several-potential-integer-overflows-in-file-offsets.patch
queue-6.6/f2fs-fix-to-check-atomic_file-in-f2fs-ioctl-interfaces.patch
queue-6.6/f2fs-require-fmode_write-for-atomic-write-ioctls.patch
queue-6.6/revert-f2fs-use-flush-command-instead-of-fua-for-zoned-device.patch [deleted file]
queue-6.6/series

index f44996dfbae15481244fd66a2ef87e4a42602021..b38b3ff6ad716c790da8d3bf43bf6a94b2001254 100644 (file)
@@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                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)) {
index 1593dcd491f8f9ec934b63cd4975afb131dda73b..162031dc1b5f8ddc16f1f697594adaa439c35cb3 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
                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 <gregkh@linuxfoundation.org>
        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 (file)
index 93528b1..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c Mon Sep 17 00:00:00 2001
-From: Wenjie Cheng <cwjhust@gmail.com>
-Date: Fri, 14 Jun 2024 00:48:41 +0000
-Subject: Revert "f2fs: use flush command instead of FUA for zoned device"
-
-From: Wenjie Cheng <cwjhust@gmail.com>
-
-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 <cwjhust@gmail.com>
-Reviewed-by: Chao Yu <chao@kernel.org>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 */
index df257ca92a477021b0fe367a9b57763b0bcf56f5..f6402b87201883fb0d629457253d5df69bef7129 100644 (file)
@@ -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
index eba713af0baeffcb9f4569e8657fa2a57737d92b..c9a21ad72a8700ca8af8649ffca995d33ade9249 100644 (file)
@@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                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)) {
index 69f54f070bc36d41299b66b78ce202bab817a1be..3d2688bd99db763ff369c24a8ed3020c65f6488f 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
                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 <gregkh@linuxfoundation.org>
        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);
  
index 53d1f3a9a1f87318d068600532864e03c358cf18..34732482a18b02a1f9902989c221567dbaf51d79 100644 (file)
@@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
        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 <gregkh@linuxfoundation.org>
        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 (file)
index 8da3994..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c Mon Sep 17 00:00:00 2001
-From: Wenjie Cheng <cwjhust@gmail.com>
-Date: Fri, 14 Jun 2024 00:48:41 +0000
-Subject: Revert "f2fs: use flush command instead of FUA for zoned device"
-
-From: Wenjie Cheng <cwjhust@gmail.com>
-
-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 <cwjhust@gmail.com>
-Reviewed-by: Chao Yu <chao@kernel.org>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 */
index d8691fe1d5c989f281dddf200e699c9430d68f77..aa37c6408f5f3bcbda82486faf4beeeff105c574 100644 (file)
@@ -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
index 44b3eb76a016f22fcdfaac78215e032c5544074c..5557fb66020334ee4ab1be044ee6caf471f63ca0 100644 (file)
@@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                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)) {
index 20eb366b797c954ea44f32463b2846e4b8750458..e1dc895c94cbc5a3dc988895a69bcbe2fdb74e3c 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
                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 <gregkh@linuxfoundation.org>
        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);
  
index d021644a1c753c310823b535f96a57648848a47a..1016cbef39fd2fb55dadf87d36eb90f0a428ae13 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
                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;
  
index 95d3bb6a5ddb790fd2431d8056046b9567b27717..30abfff5ff2027a589b0eb27fb50f198aaec56e1 100644 (file)
@@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
        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 <gregkh@linuxfoundation.org>
        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 (file)
index 8da3994..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c Mon Sep 17 00:00:00 2001
-From: Wenjie Cheng <cwjhust@gmail.com>
-Date: Fri, 14 Jun 2024 00:48:41 +0000
-Subject: Revert "f2fs: use flush command instead of FUA for zoned device"
-
-From: Wenjie Cheng <cwjhust@gmail.com>
-
-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 <cwjhust@gmail.com>
-Reviewed-by: Chao Yu <chao@kernel.org>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 */
index a72f094f25f8ba074e3d7dd0dee3add7373ca834..b926dfdd93d8c07e581c1abbd28824d2c6218070 100644 (file)
@@ -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
index 93ffdca7f804a5bdf2a835ea37cf1ebb5be5ddb2..5401f409ede28486e0bbcf46ef5b2bd439d4ab3d 100644 (file)
@@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                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)) {
index 67dd24ce067d5378ff71a1b186246c7daa171956..d40b0afbb565fc9ed07dec21664baef59ab8aa93 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
                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 <gregkh@linuxfoundation.org>
        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);
  
index 82c4e1c347b65d6159ab89c49581d8fd996a3fe0..53bff6c5f3c825200ac768747d799df69cbdb16f 100644 (file)
@@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
        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 <gregkh@linuxfoundation.org>
        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 (file)
index 677e4de..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From b722ff8ad66cf9beba971d9eb4bb7b5e6265ae5c Mon Sep 17 00:00:00 2001
-From: Wenjie Cheng <cwjhust@gmail.com>
-Date: Fri, 14 Jun 2024 00:48:41 +0000
-Subject: Revert "f2fs: use flush command instead of FUA for zoned device"
-
-From: Wenjie Cheng <cwjhust@gmail.com>
-
-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 <cwjhust@gmail.com>
-Reviewed-by: Chao Yu <chao@kernel.org>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 */
index 700094a4437ee8bc89db587e4b68c520ee23af01..41c965c31dedcd465e8ad4e5c96ded987da49ecc 100644 (file)
@@ -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