btrfs: pass a btrfs_inode to is_data_inode()

Pass a struct btrfs_inode to is_data_inode() 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/bio.c b/fs/btrfs/bio.c
index e3a57196b0ee0a92afcfdb8914538f4756c37ac1..f59b00be26f33c3aa097e7cb40d77817182ca72d 100644 (file)
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -29,7 +29,7 @@ struct btrfs_failed_bio {
 /* Is this a data path I/O that needs storage layer checksum and repair? */
 static inline bool is_data_bbio(struct btrfs_bio *bbio)
 {
-       return bbio->inode && is_data_inode(&bbio->inode->vfs_inode);
+       return bbio->inode && is_data_inode(bbio->inode);
 }
 
 static bool bbio_has_ordered_extent(struct btrfs_bio *bbio)

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index b0fe610d5940ec53e7dc3ce51e89c0dbf5f1d9cc..8b45d7e85d86a565ae3772b91682f9e39af29a94 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -418,9 +418,9 @@ static inline bool btrfs_is_free_space_inode(const struct btrfs_inode *inode)
        return test_bit(BTRFS_INODE_FREE_SPACE_INODE, &inode->runtime_flags);
 }
 
-static inline bool is_data_inode(const struct inode *inode)
+static inline bool is_data_inode(const struct btrfs_inode *inode)
 {
-       return btrfs_ino(BTRFS_I(inode)) != BTRFS_BTREE_INODE_OBJECTID;
+       return btrfs_ino(inode) != BTRFS_BTREE_INODE_OBJECTID;
 }
 
 static inline void btrfs_mod_outstanding_extents(struct btrfs_inode *inode,

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index a8290631047c63e1402ea58baa08bc9c21b62eab..08607e97d12b8ab5474902ef05c5bef6fed3791a 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -860,7 +860,7 @@ static void submit_extent_page(struct btrfs_bio_ctrl *bio_ctrl,
                /* Cap to the current ordered extent boundary if there is one. */
                if (len > bio_ctrl->len_to_oe_boundary) {
                        ASSERT(bio_ctrl->compress_type == BTRFS_COMPRESS_NONE);
-                       ASSERT(is_data_inode(&inode->vfs_inode));
+                       ASSERT(is_data_inode(inode));
                        len = bio_ctrl->len_to_oe_boundary;
                }
 

diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c
index 1a4717bcce2386b4b50954a821255f6fcfb0f313..8ddd5fcbeb9391f5a067bdd694d8ffbbfa7abd8a 100644 (file)
--- a/fs/btrfs/subpage.c
+++ b/fs/btrfs/subpage.c
@@ -74,7 +74,7 @@ bool btrfs_is_subpage(const struct btrfs_fs_info *fs_info, struct address_space
         * mapping. And if page->mapping->host is data inode, it's subpage.
         * As we have ruled our sectorsize >= PAGE_SIZE case already.
         */
-       if (!mapping || !mapping->host || is_data_inode(mapping->host))
+       if (!mapping || !mapping->host || is_data_inode(BTRFS_I(mapping->host)))
                return true;
 
        /*
@@ -283,7 +283,7 @@ void btrfs_subpage_end_reader(const struct btrfs_fs_info *fs_info,
        bool last;
 
        btrfs_subpage_assert(fs_info, folio, start, len);
-       is_data = is_data_inode(folio->mapping->host);
+       is_data = is_data_inode(BTRFS_I(folio->mapping->host));
 
        spin_lock_irqsave(&subpage->lock, flags);
 

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 992a5b7756ca8abf988b1efcd6d2d30819d44360..8a99f5187e3043568450be84f9b7fba3494f4a36 100644 (file)
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1723,7 +1723,7 @@ bool btrfs_use_zone_append(struct btrfs_bio *bbio)
        if (!btrfs_is_zoned(fs_info))
                return false;
 
-       if (!inode || !is_data_inode(&inode->vfs_inode))
+       if (!inode || !is_data_inode(inode))
                return false;
 
        if (btrfs_op(&bbio->bio) != BTRFS_MAP_WRITE)