diff options
| author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2017-10-12 12:00:59 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-10-12 12:00:59 -0400 |
| commit | 6642586b3e5f9e0b559d20352d8d42ad84224d1f (patch) | |
| tree | 215de3257712900bb4dd31c14c2da31d044f0507 /fs | |
| parent | 7d3e06a8dae893a0df2777543980dc62eff61b59 (diff) | |
| download | linux-6642586b3e5f9e0b559d20352d8d42ad84224d1f.tar.bz2 | |
ext4: add ext4_should_use_dax()
This helper, in the spirit of ext4_should_dioread_nolock() et al., replaces
the complex conditional in ext4_set_inode_flags().
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 350e0910ed32..9f836e2ec18c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4610,6 +4610,21 @@ int ext4_get_inode_loc(struct inode *inode, struct ext4_iloc *iloc) !ext4_test_inode_state(inode, EXT4_STATE_XATTR)); } +static bool ext4_should_use_dax(struct inode *inode) +{ + if (!test_opt(inode->i_sb, DAX)) + return false; + if (!S_ISREG(inode->i_mode)) + return false; + if (ext4_should_journal_data(inode)) + return false; + if (ext4_has_inline_data(inode)) + return false; + if (ext4_encrypted_inode(inode)) + return false; + return true; +} + void ext4_set_inode_flags(struct inode *inode) { unsigned int flags = EXT4_I(inode)->i_flags; @@ -4625,9 +4640,7 @@ void ext4_set_inode_flags(struct inode *inode) new_fl |= S_NOATIME; if (flags & EXT4_DIRSYNC_FL) new_fl |= S_DIRSYNC; - if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode) && - !ext4_should_journal_data(inode) && !ext4_has_inline_data(inode) && - !ext4_encrypted_inode(inode)) + if (ext4_should_use_dax(inode)) new_fl |= S_DAX; inode_set_flags(inode, new_fl, S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX); |