[ Sasha's backport helper bot ] Hi, Found matching upstream commit: 69313850dce33ce8c24b38576a279421f4c60996 WARNING: Author mismatch between patch and found commit: Backport author: David Sterba <dsterba@xxxxxxxx> Commit author: Luca Stefani <luca.stefani.ge1@xxxxxxxxx> Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (different SHA1: fba6544ff4bf) 6.6.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-25 13:53:18.073145886 -0500 +++ /tmp/tmp.ws7hjJgxh2 2024-11-25 13:53:18.068806643 -0500 @@ -17,14 +17,14 @@ --- fs/btrfs/extent-tree.c | 7 ++++++- fs/btrfs/free-space-cache.c | 4 ++-- - fs/btrfs/free-space-cache.h | 6 ++++++ - 3 files changed, 14 insertions(+), 3 deletions(-) + fs/btrfs/free-space-cache.h | 7 +++++++ + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c -index ad70548d1f722..d9f511babd89a 100644 +index b3680e1c7054..599407120513 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c -@@ -1316,6 +1316,11 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, +@@ -1319,6 +1319,11 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, start += bytes_to_discard; bytes_left -= bytes_to_discard; *discarded_bytes += bytes_to_discard; @@ -36,7 +36,7 @@ } return ret; -@@ -6470,7 +6475,7 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed) +@@ -6094,7 +6099,7 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed) start += len; *trimmed += bytes; @@ -46,10 +46,10 @@ break; } diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c -index eaa1dbd313528..f4bcb25306606 100644 +index 3bcf4a30cad7..9a6ec9344c3e 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c -@@ -3809,7 +3809,7 @@ static int trim_no_bitmap(struct btrfs_block_group *block_group, +@@ -3808,7 +3808,7 @@ static int trim_no_bitmap(struct btrfs_block_group *block_group, if (async && *total_trimmed) break; @@ -58,7 +58,7 @@ ret = -ERESTARTSYS; break; } -@@ -4000,7 +4000,7 @@ static int trim_bitmaps(struct btrfs_block_group *block_group, +@@ -3999,7 +3999,7 @@ static int trim_bitmaps(struct btrfs_block_group *block_group, } block_group->discard_cursor = start; @@ -68,18 +68,19 @@ reset_trimming_bitmap(ctl, offset); ret = -ERESTARTSYS; diff --git a/fs/btrfs/free-space-cache.h b/fs/btrfs/free-space-cache.h -index 83774bfd7b3bb..9f1dbfdee8cab 100644 +index 33b4da3271b1..bd80c7b2af96 100644 --- a/fs/btrfs/free-space-cache.h +++ b/fs/btrfs/free-space-cache.h -@@ -10,6 +10,7 @@ - #include <linux/list.h> - #include <linux/spinlock.h> - #include <linux/mutex.h> -+#include <linux/freezer.h> - #include "fs.h" +@@ -6,6 +6,8 @@ + #ifndef BTRFS_FREE_SPACE_CACHE_H + #define BTRFS_FREE_SPACE_CACHE_H - struct inode; -@@ -56,6 +57,11 @@ static inline bool btrfs_free_space_trimming_bitmap( ++#include <linux/freezer.h> ++ + /* + * This is the trim state of an extent or bitmap. + * +@@ -43,6 +45,11 @@ static inline bool btrfs_free_space_trimming_bitmap( return (info->trim_state == BTRFS_TRIM_STATE_TRIMMING); } @@ -91,3 +92,6 @@ /* * Deltas are an effective way to populate global statistics. Give macro names * to make it clear what we're doing. An example is discard_extents in +-- +2.45.0 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |
