ext4, dax: set ext4_dax_aops for dax files

toshikani · tytso · commit cce6c9f7e602 · 2018-09-15T21:37:59.000-04:00
Sync syscall to DAX file needs to flush processor cache, but it currently does not flush to existing DAX files. This is because 'ext4_da_aops' is set to address_space_operations of existing DAX files, instead of 'ext4_dax_aops', since S_DAX flag is set after ext4_set_aops() in the open path. New file -------- lookup_open ext4_create __ext4_new_inode ext4_set_inode_flags // Set S_DAX flag ext4_set_aops // Set aops to ext4_dax_aops Existing file ------------- lookup_open ext4_lookup ext4_iget ext4_set_aops // Set aops to ext4_da_aops ext4_set_inode_flags // Set S_DAX flag Change ext4_iget() to initialize i_flags before ext4_set_aops(). Fixes: 5f0663b ("ext4, dax: introduce ext4_dax_aops") Signed-off-by: Toshi Kani <toshi.kani@hpe.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Suggested-by: Jan Kara <jack@suse.cz> Cc: stable@vger.kernel.org
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
@@ -4896,6 +4896,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);
 	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))
@@ -5042,7 +5043,6 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
 		goto bad_inode;
 	}
 	brelse(iloc.bh);
-	ext4_set_inode_flags(inode);
 
 	unlock_new_inode(inode);
 	return inode;

Original file line number	Diff line number	Diff line change
`@@ -4896,6 +4896,7 @@ struct inode ext4_iget(struct super_block sb, unsigned long ino)`
`4896`	`4896`	`* not initialized on a new filesystem. */`
`4897`	`4897`	`}`
`4898`	`4898`	`ei->i_flags = le32_to_cpu(raw_inode->i_flags);`
	`4899`	`+ ext4_set_inode_flags(inode);`
`4899`	`4900`	`inode->i_blocks = ext4_inode_blocks(raw_inode, ei);`
`4900`	`4901`	`ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);`
`4901`	`4902`	`if (ext4_has_feature_64bit(sb))`
`@@ -5042,7 +5043,6 @@ struct inode ext4_iget(struct super_block sb, unsigned long ino)`
`5042`	`5043`	`goto bad_inode;`
`5043`	`5044`	`}`
`5044`	`5045`	`brelse(iloc.bh);`
`5045`		`- ext4_set_inode_flags(inode);`
`5046`	`5046`
`5047`	`5047`	`unlock_new_inode(inode);`
`5048`	`5048`	`return inode;`