[PATCH v4 13/18] ext4: use DEFINE_FSDAX_AOPS
From: Dan Williams <hidden>
Date: 2017-12-24 01:05:24
Also in:
linux-fsdevel, linux-xfs, nvdimm
Subsystem:
ext4 file system, filesystems (vfs and infrastructure), the rest · Maintainers:
"Theodore Ts'o", Alexander Viro, Christian Brauner, Linus Torvalds
In preparation for the dax implementation to start associating dax pages to inodes via page->mapping, we need to provide a 'struct address_space_operations' instance for dax. Otherwise, direct-I/O triggers incorrect page cache assumptions and warnings. Cc: "Theodore Ts'o" <redacted> Cc: Andreas Dilger <redacted> Cc: linux-ext4-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Jan Kara <redacted> Signed-off-by: Dan Williams <redacted> --- fs/ext4/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 7df2c5644e59..065d11f43cb3 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c@@ -3928,6 +3928,8 @@ static const struct address_space_operations ext4_da_aops = { .error_remove_page = generic_error_remove_page, }; +static DEFINE_FSDAX_AOPS(ext4_dax_aops, ext4_writepages); + void ext4_set_aops(struct inode *inode) { switch (ext4_inode_journal_mode(inode)) {
@@ -3940,7 +3942,9 @@ void ext4_set_aops(struct inode *inode) default: BUG(); } - if (test_opt(inode->i_sb, DELALLOC)) + if (IS_DAX(inode)) + inode->i_mapping->a_ops = &ext4_dax_aops; + else if (test_opt(inode->i_sb, DELALLOC)) inode->i_mapping->a_ops = &ext4_da_aops; else inode->i_mapping->a_ops = &ext4_aops;