Re: [PATCH 6.6.x] btrfs: add cancellation points to trim loops

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: 69313850dce33ce8c24b38576a279421f4c60996

WARNING: Author mismatch between patch and upstream commit:
Backport author: David Sterba <dsterba@suse.com>
Commit author: Luca Stefani <luca.stefani.ge1@gmail.com>


Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Not found

Note: The patch differs from the upstream commit:
---
1:  69313850dce33 ! 1:  949c2e944f056 btrfs: add cancellation points to trim loops
    @@ Metadata
      ## Commit message ##
         btrfs: add cancellation points to trim loops
     
    +    commit 69313850dce33ce8c24b38576a279421f4c60996 upstream.
    +
         There are reports that system cannot suspend due to running trim because
         the task responsible for trimming the device isn't able to finish in
         time, especially since we have a free extent discarding phase, which can
    @@ fs/btrfs/free-space-cache.c: static int trim_bitmaps(struct btrfs_block_group *b
     
      ## fs/btrfs/free-space-cache.h ##
     @@
    - #include <linux/list.h>
    - #include <linux/spinlock.h>
    - #include <linux/mutex.h>
    -+#include <linux/freezer.h>
    - #include "fs.h"
    + #ifndef BTRFS_FREE_SPACE_CACHE_H
    + #define BTRFS_FREE_SPACE_CACHE_H
      
    - struct inode;
    ++#include <linux/freezer.h>
    ++
    + /*
    +  * This is the trim state of an extent or bitmap.
    +  *
     @@ fs/btrfs/free-space-cache.h: static inline bool btrfs_free_space_trimming_bitmap(
      	return (info->trim_state == BTRFS_TRIM_STATE_TRIMMING);
      }
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y        |  Success    |  Success   |