ext4: allow the dax flag to be set and cleared on inline directories

[sfrench/cifs-2.6.git] / fs / ext4 / ialloc.c

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 5f0c7fe326720b59e5eab0a512f47371eb154879..71d321b3b984493a7c0bb33dd4205ce553842820 100644 (file)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1292,7 +1292,8 @@ got:
 
        ei->i_extra_isize = sbi->s_want_extra_isize;
        ei->i_inline_off = 0;
-       if (ext4_has_feature_inline_data(sb))
+       if (ext4_has_feature_inline_data(sb) &&
+           (!(ei->i_flags & EXT4_DAX_FL) || S_ISDIR(mode)))
                ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
        ret = inode;
        err = dquot_alloc_inode(inode);