X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=fs%2Fext4%2Fialloc.c;fp=fs%2Fext4%2Fialloc.c;h=71d321b3b984493a7c0bb33dd4205ce553842820;hb=4811d9929cdae4238baf5b2522247bd2f9fa7b50;hp=5f0c7fe326720b59e5eab0a512f47371eb154879;hpb=fcdf3c34b7abdcbb49690c94c7fa6ce224dc9749;p=sfrench%2Fcifs-2.6.git

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 5f0c7fe32672..71d321b3b984 100644
--- 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);