Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6642586b authored by Ross Zwisler's avatar Ross Zwisler Committed by Theodore Ts'o
Browse files

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: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 7d3e06a8

fs/ext4/inode.c

+16 −3
Original line number Diff line number Diff line
@@ -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);