diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2021-04-12 17:19:00 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-04-12 23:33:01 -0400 |
| commit | 4811d9929cdae4238baf5b2522247bd2f9fa7b50 (patch) | |
| tree | 19fdf46385a8291b29e13dede84df47819ba63cc /fs/ext4/ialloc.c | |
| parent | fcdf3c34b7abdcbb49690c94c7fa6ce224dc9749 (diff) | |
ext4: allow the dax flag to be set and cleared on inline directories
This is needed to allow generic/607 to pass for file systems with the
inline data_feature enabled, and it allows the use of file systems
where the directories use inline_data, while the files are accessed
via DAX.
Cc: stable@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ialloc.c')
| -rw-r--r-- | fs/ext4/ialloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |