Drop btrfs-add-and-use-helper-to-check-if-block-group-is-.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/btrfs-add-and-use-helper-to-check-if-block-group-is-.patch b/queue-5.10/btrfs-add-and-use-helper-to-check-if-block-group-is-.patch
deleted file mode 100644 (file)
index f73b496..0000000
--- a/queue-5.10/btrfs-add-and-use-helper-to-check-if-block-group-is-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b8912dfa6807a2a31faec7c9fdc7d5c7609f3c8e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 25 Jan 2024 09:53:06 +0000
-Subject: btrfs: add and use helper to check if block group is used
-
-From: Filipe Manana <fdmanana@suse.com>
-
-[ Upstream commit 1693d5442c458ae8d5b0d58463b873cd879569ed ]
-
-Add a helper function to determine if a block group is being used and make
-use of it at btrfs_delete_unused_bgs(). This helper will also be used in
-future code changes.
-
-Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-Reviewed-by: Josef Bacik <josef@toxicpanda.com>
-Reviewed-by: Boris Burkov <boris@bur.io>
-Signed-off-by: Filipe Manana <fdmanana@suse.com>
-Reviewed-by: David Sterba <dsterba@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/btrfs/block-group.c | 3 +--
- fs/btrfs/block-group.h | 7 +++++++
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
-index c4e3c1a5de059..9a7c7e0f7c233 100644
---- a/fs/btrfs/block-group.c
-+++ b/fs/btrfs/block-group.c
-@@ -1393,8 +1393,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
-               }
- 
-               spin_lock(&block_group->lock);
--              if (block_group->reserved || block_group->pinned ||
--                  block_group->used || block_group->ro ||
-+              if (btrfs_is_block_group_used(block_group) || block_group->ro ||
-                   list_is_singular(&block_group->list)) {
-                       /*
-                        * We want to bail if we made new allocations or have
-diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h
-index 4c7614346f724..0d02b75f9e7e3 100644
---- a/fs/btrfs/block-group.h
-+++ b/fs/btrfs/block-group.h
-@@ -196,6 +196,13 @@ static inline u64 btrfs_block_group_end(struct btrfs_block_group *block_group)
-       return (block_group->start + block_group->length);
- }
- 
-+static inline bool btrfs_is_block_group_used(const struct btrfs_block_group *bg)
-+{
-+      lockdep_assert_held(&bg->lock);
-+
-+      return (bg->used > 0 || bg->reserved > 0 || bg->pinned > 0);
-+}
-+
- static inline bool btrfs_is_block_group_data_only(
-                                       struct btrfs_block_group *block_group)
- {
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index f4981f9d6930a6ca37fbb1831eb818adf4fe2db4..fb824a9dbe57e4ae27f4b045ced96900335cd50d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -2,7 +2,6 @@ io_uring-unix-drop-usage-of-io_uring-socket.patch
 io_uring-drop-any-code-related-to-scm_rights.patch
 rcu-tasks-provide-rcu_trace_implies_rcu_gp.patch
 bpf-defer-the-free-of-inner-map-when-necessary.patch
-btrfs-add-and-use-helper-to-check-if-block-group-is-.patch
 selftests-tls-use-exact-comparison-in-recv_partial.patch
 asoc-rt5645-make-lattepanda-board-dmi-match-more-pre.patch
 x86-xen-add-some-null-pointer-checking-to-smp.c.patch

diff --git a/queue-5.15/btrfs-add-and-use-helper-to-check-if-block-group-is-.patch b/queue-5.15/btrfs-add-and-use-helper-to-check-if-block-group-is-.patch
deleted file mode 100644 (file)
index 2a0a3b0..0000000
--- a/queue-5.15/btrfs-add-and-use-helper-to-check-if-block-group-is-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b15f99ab9837489965189e32a56fa729570c766c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 25 Jan 2024 09:53:06 +0000
-Subject: btrfs: add and use helper to check if block group is used
-
-From: Filipe Manana <fdmanana@suse.com>
-
-[ Upstream commit 1693d5442c458ae8d5b0d58463b873cd879569ed ]
-
-Add a helper function to determine if a block group is being used and make
-use of it at btrfs_delete_unused_bgs(). This helper will also be used in
-future code changes.
-
-Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-Reviewed-by: Josef Bacik <josef@toxicpanda.com>
-Reviewed-by: Boris Burkov <boris@bur.io>
-Signed-off-by: Filipe Manana <fdmanana@suse.com>
-Reviewed-by: David Sterba <dsterba@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/btrfs/block-group.c | 3 +--
- fs/btrfs/block-group.h | 7 +++++++
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
-index 4ca6828586af5..a2bac7196d18b 100644
---- a/fs/btrfs/block-group.c
-+++ b/fs/btrfs/block-group.c
-@@ -1330,8 +1330,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
-               }
- 
-               spin_lock(&block_group->lock);
--              if (block_group->reserved || block_group->pinned ||
--                  block_group->used || block_group->ro ||
-+              if (btrfs_is_block_group_used(block_group) || block_group->ro ||
-                   list_is_singular(&block_group->list)) {
-                       /*
-                        * We want to bail if we made new allocations or have
-diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h
-index a15868d607a92..f042c1c85a255 100644
---- a/fs/btrfs/block-group.h
-+++ b/fs/btrfs/block-group.h
-@@ -211,6 +211,13 @@ static inline u64 btrfs_block_group_end(struct btrfs_block_group *block_group)
-       return (block_group->start + block_group->length);
- }
- 
-+static inline bool btrfs_is_block_group_used(const struct btrfs_block_group *bg)
-+{
-+      lockdep_assert_held(&bg->lock);
-+
-+      return (bg->used > 0 || bg->reserved > 0 || bg->pinned > 0);
-+}
-+
- static inline bool btrfs_is_block_group_data_only(
-                                       struct btrfs_block_group *block_group)
- {
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 6fafa01192ece262755dfc917a9e8b8626e44773..6c0ed72b0c47c01ddfca6c1531cbc34d88d865a5 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -2,7 +2,6 @@ io_uring-unix-drop-usage-of-io_uring-socket.patch
 io_uring-drop-any-code-related-to-scm_rights.patch
 rcu-tasks-provide-rcu_trace_implies_rcu_gp.patch
 bpf-defer-the-free-of-inner-map-when-necessary.patch
-btrfs-add-and-use-helper-to-check-if-block-group-is-.patch
 selftests-tls-use-exact-comparison-in-recv_partial.patch
 asoc-rt5645-make-lattepanda-board-dmi-match-more-pre.patch
 x86-xen-add-some-null-pointer-checking-to-smp.c.patch