From aa2f77920b743c44e02e2dc8474bbf8bd30007a2 Mon Sep 17 00:00:00 2001
From: Xiao Yang <yangx.jy@cn.fujitsu.com>
Date: Fri, 28 Aug 2020 16:43:30 +0800
Subject: [PATCH] ext4: disallow modifying DAX inode flag if inline_data has
 been set
Git-commit: aa2f77920b743c44e02e2dc8474bbf8bd30007a2
Patch-mainline: v5.10-rc1
References: bsc#1179814

inline_data is mutually exclusive to DAX so enabling both of them triggers
the following issue:

------------------------------------------
# mkfs.ext4 -F -O inline_data /dev/pmem1
...
# mount /dev/pmem1 /mnt
# echo 'test' >/mnt/file
# lsattr -l /mnt/file
/mnt/file                    Inline_Data
# xfs_io -c "chattr +x" /mnt/file
# xfs_io -c "lsattr -v" /mnt/file
[dax] /mnt/file
# umount /mnt
# mount /dev/pmem1 /mnt
# cat /mnt/file
cat: /mnt/file: Numerical result out of range
------------------------------------------

Fixes: b383a73f2b83 ("fs/ext4: Introduce DAX inode flag")
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/20200828084330.15776-1-yangx.jy@cn.fujitsu.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Acked-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/ext4.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -442,7 +442,8 @@ struct flex_groups {
 #define EXT4_FL_SHOULD_SWAP (EXT4_HUGE_FILE_FL | EXT4_EXTENTS_FL)
 
 /* Flags which are mutually exclusive to DAX */
-#define EXT4_DAX_MUT_EXCL (EXT4_ENCRYPT_FL | EXT4_JOURNAL_DATA_FL)
+#define EXT4_DAX_MUT_EXCL (EXT4_ENCRYPT_FL | EXT4_JOURNAL_DATA_FL |\
+			   EXT4_INLINE_DATA_FL)
 
 /* Mask out flags that are inappropriate for the given type of inode. */
 static inline __u32 ext4_mask_flags(umode_t mode, __u32 flags)