From: Chao Yu <chao@kernel.org>
Date: Tue, 12 Jul 2022 03:17:15 +0000 (+0800)
Subject: f2fs: fix to check inline_data during compressed inode conversion
X-Git-Tag: v6.0-rc1~65^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7165841d578e0592848e09dc9d131aa30be44e1b;p=thirdparty%2Flinux.git

f2fs: fix to check inline_data during compressed inode conversion

When converting inode to compressed one via ioctl, it needs to check
inline_data, since inline_data flag and compressed flag are incompatible.

Fixes: 4c8ff7095bef ("f2fs: support data compression")
Signed-off-by: Chao Yu <chao.yu@oppo.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6d9f7d577c8ae..116d491b346d4 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4404,7 +4404,7 @@ static inline bool f2fs_low_mem_mode(struct f2fs_sb_info *sbi)
 static inline bool f2fs_may_compress(struct inode *inode)
 {
 	if (IS_SWAPFILE(inode) || f2fs_is_pinned_file(inode) ||
-				f2fs_is_atomic_file(inode))
+		f2fs_is_atomic_file(inode) || f2fs_has_inline_data(inode))
 		return false;
 	return S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode);
 }