From: Chung-Chiang Cheng <cccheng@synology.com>

Date: Fri, 15 Apr 2022 16:04:05 +0800

Git-commit: e6f9d69648029e48b8f97db09368d419b5e2614a

Patch-mainline: v5.18-rc6

References: bsc#1206149

Subject: [PATCH] btrfs: export a helper for compression hard check

inode_can_compress will be used outside of inode.c to check the

availability of setting compression flag by xattr. This patch moves

this function as an internal helper and renames it to

btrfs_inode_can_compress.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>

Signed-off-by: Chung-Chiang Cheng <cccheng@synology.com>

Reviewed-by: David Sterba <dsterba@suse.com>

Signed-off-by: David Sterba <dsterba@suse.com>

Signed-off-by: Filipe Manana <fdmanana@suse.com>

---

 fs/btrfs/btrfs_inode.h | 14 ++++++++++++++

 fs/btrfs/inode.c       | 18 ++----------------

 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h

index 2172b37c8..476a25661 100644

--- a/fs/btrfs/btrfs_inode.h

+++ b/fs/btrfs/btrfs_inode.h

@@ -339,6 +339,20 @@ static inline bool btrfs_inode_in_log(struct btrfs_inode *inode, u64 generation)

 	return ret;

 }

+/*

+ * Check if the inode has flags compatible with compression

+ */

+static inline bool btrfs_inode_can_compress(const struct btrfs_inode *inode)

+{

+	/* Subpage doesn't support compression yet */

+	if (inode->root->fs_info->sectorsize < PAGE_SIZE)

+		return false;

+	if (inode->flags & BTRFS_INODE_NODATACOW ||

+	    inode->flags & BTRFS_INODE_NODATASUM)

+		return false;

+	return true;

+}

+

 struct btrfs_dio_private {

 	struct inode *inode;

 	u64 logical_offset;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c

index c9c7d97eb..45e6827aa 100644

--- a/fs/btrfs/inode.c

+++ b/fs/btrfs/inode.c

@@ -485,20 +485,6 @@ static noinline int add_async_extent(struct async_chunk *cow,

 	return 0;

 }

-/*

- * Check if the inode has flags compatible with compression

- */

-static inline bool inode_can_compress(struct btrfs_inode *inode)

-{

-	/* Subpage doesn't support compression yet */

-	if (inode->root->fs_info->sectorsize < PAGE_SIZE)

-		return false;

-	if (inode->flags & BTRFS_INODE_NODATACOW ||

-	    inode->flags & BTRFS_INODE_NODATASUM)

-		return false;

-	return true;

-}

-

 /*

  * Check if the inode needs to be submitted to compression, based on mount

  * options, defragmentation, properties or heuristics.

@@ -508,7 +494,7 @@ static inline int inode_need_compress(struct btrfs_inode *inode, u64 start,

 {

 	struct btrfs_fs_info *fs_info = inode->root->fs_info;

-	if (!inode_can_compress(inode)) {

+	if (!btrfs_inode_can_compress(inode)) {

 		WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),

 			KERN_ERR "BTRFS: unexpected compression for ino %llu\n",

 			btrfs_ino(inode));

@@ -1950,7 +1936,7 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page

 		ASSERT(!zoned);

 		ret = run_delalloc_nocow(inode, locked_page, start, end,

 					 page_started, nr_written);

-	} else if (!inode_can_compress(inode) ||

+	} else if (!btrfs_inode_can_compress(inode) ||

 		   !inode_need_compress(inode, start, end)) {

 		if (zoned)

 			ret = run_delalloc_zoned(inode, locked_page, start, end,

-- 

2.26.2