Commit 043546e4 authored by Ira Weiny's avatar Ira Weiny Committed by Theodore Ts'o
Browse files

fs/ext4: Only change S_DAX on inode load 



To prevent complications with in memory inodes we only set S_DAX on
inode load.  FS_XFLAG_DAX can be changed at any time and S_DAX will
change after inode eviction and reload.

Add init bool to ext4_set_inode_flags() to indicate if the inode is
being newly initialized.

Assert that S_DAX is not set on an inode which is just being loaded.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>

Link: https://lore.kernel.org/r/20200528150003.828793-6-ira.weiny@intel.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent a8ab6d38

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -2693,7 +2693,7 @@ extern int ext4_can_truncate(struct inode *inode); 
extern int ext4_truncate(struct inode *);

extern int ext4_break_layouts(struct inode *);

extern int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length);

extern void ext4_set_inode_flags(struct inode *);

extern void ext4_set_inode_flags(struct inode *, bool init);

extern int ext4_alloc_da_blocks(struct inode *inode);

extern void ext4_set_aops(struct inode *inode);

extern int ext4_writepage_trans_blocks(struct inode *);

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ got: 
	ei->i_block_group = group;

	ei->i_last_alloc_group = ~0;



	ext4_set_inode_flags(inode);

	ext4_set_inode_flags(inode, true);

	if (IS_DIRSYNC(inode))

		ext4_handle_sync(handle);

	if (insert_inode_locked(inode) < 0) {

fs/ext4/inode.c

+10 −3
Original line number Diff line number Diff line
@@ -4420,11 +4420,13 @@ static bool ext4_should_enable_dax(struct inode *inode) 
	return false;

}



void ext4_set_inode_flags(struct inode *inode)

void ext4_set_inode_flags(struct inode *inode, bool init)

{

	unsigned int flags = EXT4_I(inode)->i_flags;

	unsigned int new_fl = 0;



	WARN_ON_ONCE(IS_DAX(inode) && init);



	if (flags & EXT4_SYNC_FL)

		new_fl |= S_SYNC;

	if (flags & EXT4_APPEND_FL)
@@ -4435,8 +4437,13 @@ void ext4_set_inode_flags(struct inode *inode) 
		new_fl |= S_NOATIME;

	if (flags & EXT4_DIRSYNC_FL)

		new_fl |= S_DIRSYNC;

	if (ext4_should_enable_dax(inode))



	/* Because of the way inode_set_flags() works we must preserve S_DAX

	 * here if already set. */

	new_fl |= (inode->i_flags & S_DAX);

	if (init && ext4_should_enable_dax(inode))

		new_fl |= S_DAX;



	if (flags & EXT4_ENCRYPT_FL)

		new_fl |= S_ENCRYPTED;

	if (flags & EXT4_CASEFOLD_FL)
@@ -4650,7 +4657,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, 
		 * not initialized on a new filesystem. */

	}

	ei->i_flags = le32_to_cpu(raw_inode->i_flags);

	ext4_set_inode_flags(inode);

	ext4_set_inode_flags(inode, true);

	inode->i_blocks = ext4_inode_blocks(raw_inode, ei);

	ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);

	if (ext4_has_feature_64bit(sb))

fs/ext4/ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -381,7 +381,8 @@ static int ext4_ioctl_setflags(struct inode *inode, 
			ext4_clear_inode_flag(inode, i);

	}



	ext4_set_inode_flags(inode);

	ext4_set_inode_flags(inode, false);



	inode->i_ctime = current_time(inode);



	err = ext4_mark_iloc_dirty(handle, inode, &iloc);

fs/ext4/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1348,7 +1348,7 @@ static int ext4_set_context(struct inode *inode, const void *ctx, size_t len, 
			 * Update inode->i_flags - S_ENCRYPTED will be enabled,

			 * S_DAX may be disabled

			 */

			ext4_set_inode_flags(inode);

			ext4_set_inode_flags(inode, false);

		}

		return res;

	}
@@ -1375,7 +1375,7 @@ retry: 
		 * Update inode->i_flags - S_ENCRYPTED will be enabled,

		 * S_DAX may be disabled

		 */

		ext4_set_inode_flags(inode);

		ext4_set_inode_flags(inode, false);

		res = ext4_mark_inode_dirty(handle, inode);

		if (res)

			EXT4_ERROR_INODE(inode, "Failed to mark inode dirty");

CRA Git | Maintained and supported by SUSTech CRA and CCSE