btrfs: make inode_can_compress take btrfs_inode (99c88dc7) · Commits · 戴 / test

fs/btrfs/inode.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -412,10 +412,10 @@ static noinline int add_async_extent(struct async_chunk *cow,
		/*
		* Check if the inode has flags compatible with compression
		*/
		static inline bool inode_can_compress(struct inode *inode)
		static inline bool inode_can_compress(struct btrfs_inode *inode)
		{
		if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATACOW \|\|
		BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)
		if (inode->flags & BTRFS_INODE_NODATACOW \|\|
		inode->flags & BTRFS_INODE_NODATASUM)
		return false;
		return true;
		}
		@@ -428,7 +428,7 @@ static inline int inode_need_compress(struct inode *inode, u64 start, u64 end)
		{
		struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

		if (!inode_can_compress(inode)) {
		if (!inode_can_compress(BTRFS_I(inode))) {
		WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),
		KERN_ERR "BTRFS: unexpected compression for ino %llu\n",
		btrfs_ino(BTRFS_I(inode)));
		@@ -1826,7 +1826,7 @@ int btrfs_run_delalloc_range(struct inode inode, struct page locked_page,
		} else if (BTRFS_I(inode)->flags & BTRFS_INODE_PREALLOC && !force_cow) {
		ret = run_delalloc_nocow(BTRFS_I(inode), locked_page, start, end,
		page_started, 0, nr_written);
		} else if (!inode_can_compress(inode) \|\|
		} else if (!inode_can_compress(BTRFS_I(inode)) \|\|
		!inode_need_compress(inode, start, end)) {
		ret = cow_file_range(BTRFS_I(inode), locked_page, start, end,
		page_started, nr_written, 1);