btrfs: pass a btrfs_inode to btrfs_compress_heuristic()

Pass a struct btrfs_inode to btrfs_compress_heuristic() as it's an
internal interface, allowing to remove some use of BTRFS_I.

Reviewed-by: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index de136ef3a2f8146b5bbe91e9b1a5b101ad1f03b9..85eb2cadbbf6068b7d6942914ead96cc6444970a 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -1507,7 +1507,7 @@ static void heuristic_collect_sample(struct inode *inode, u64 start, u64 end,
  *
  * Return non-zero if the compression should be done, 0 otherwise.
  */
-int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end)
+int btrfs_compress_heuristic(struct btrfs_inode *inode, u64 start, u64 end)
 {
        struct list_head *ws_list = get_workspace(0, 0);
        struct heuristic_ws *ws;
@@ -1517,7 +1517,7 @@ int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end)
 
        ws = list_entry(ws_list, struct heuristic_ws, list);
 
-       heuristic_collect_sample(inode, start, end, ws);
+       heuristic_collect_sample(&inode->vfs_inode, start, end, ws);
 
        if (sample_repeated_patterns(ws)) {
                ret = 1;

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index c20c1a1b09d58e11e08231f66b25b960a8515890..cfdc643191862ab6f919cc6bc6c9348408af7919 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -144,7 +144,7 @@ extern const struct btrfs_compress_op btrfs_zstd_compress;
 const char* btrfs_compress_type2str(enum btrfs_compression_type type);
 bool btrfs_compress_is_valid_type(const char *str, size_t len);
 
-int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end);
+int btrfs_compress_heuristic(struct btrfs_inode *inode, u64 start, u64 end);
 
 int btrfs_compress_filemap_get_folio(struct address_space *mapping, u64 start,
                                     struct folio **in_folio_ret);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 510a12e03a051680d6617b6042e6e485b28400a9..87ab9db699760e2badfc974fa0c5720be1d2d078 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -876,7 +876,7 @@ static inline int inode_need_compress(struct btrfs_inode *inode, u64 start,
        if (btrfs_test_opt(fs_info, COMPRESS) ||
            inode->flags & BTRFS_INODE_COMPRESS ||
            inode->prop_compress)
-               return btrfs_compress_heuristic(&inode->vfs_inode, start, end);
+               return btrfs_compress_heuristic(inode, start, end);
        return 0;
 }