diff options
Diffstat (limited to 'fs/ext4/file.c')
-rw-r--r-- | fs/ext4/file.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 9ad03036d9f5..7a6defcf3352 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
@@ -206,6 +206,7 @@ static int ext4_dax_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
206 | static const struct vm_operations_struct ext4_dax_vm_ops = { | 206 | static const struct vm_operations_struct ext4_dax_vm_ops = { |
207 | .fault = ext4_dax_fault, | 207 | .fault = ext4_dax_fault, |
208 | .page_mkwrite = ext4_dax_mkwrite, | 208 | .page_mkwrite = ext4_dax_mkwrite, |
209 | .pfn_mkwrite = dax_pfn_mkwrite, | ||
209 | }; | 210 | }; |
210 | #else | 211 | #else |
211 | #define ext4_dax_vm_ops ext4_file_vm_ops | 212 | #define ext4_dax_vm_ops ext4_file_vm_ops |
@@ -622,24 +623,6 @@ const struct file_operations ext4_file_operations = { | |||
622 | .fallocate = ext4_fallocate, | 623 | .fallocate = ext4_fallocate, |
623 | }; | 624 | }; |
624 | 625 | ||
625 | #ifdef CONFIG_FS_DAX | ||
626 | const struct file_operations ext4_dax_file_operations = { | ||
627 | .llseek = ext4_llseek, | ||
628 | .read_iter = generic_file_read_iter, | ||
629 | .write_iter = ext4_file_write_iter, | ||
630 | .unlocked_ioctl = ext4_ioctl, | ||
631 | #ifdef CONFIG_COMPAT | ||
632 | .compat_ioctl = ext4_compat_ioctl, | ||
633 | #endif | ||
634 | .mmap = ext4_file_mmap, | ||
635 | .open = ext4_file_open, | ||
636 | .release = ext4_release_file, | ||
637 | .fsync = ext4_sync_file, | ||
638 | /* Splice not yet supported with DAX */ | ||
639 | .fallocate = ext4_fallocate, | ||
640 | }; | ||
641 | #endif | ||
642 | |||
643 | const struct inode_operations ext4_file_inode_operations = { | 626 | const struct inode_operations ext4_file_inode_operations = { |
644 | .setattr = ext4_setattr, | 627 | .setattr = ext4_setattr, |
645 | .getattr = ext4_getattr, | 628 | .getattr = ext4_getattr, |