diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-06-04 13:01:49 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-06-04 13:01:49 +1000 |
| commit | 66e8ac7bfa0a591b8cfaa447db2daa5b6e9221d0 (patch) | |
| tree | e21331c5c8ad224d1b8d7f8762f78f4377c881ab /fs/ext2/file.c | |
| parent | b9a350a1183efd7b63e59b6eaa39abfea908d0be (diff) | |
| parent | cbe4dab119f211ff6642d617f541087894e99e4f (diff) | |
Merge branch 'xfs-dax-support' into for-next
Diffstat (limited to 'fs/ext2/file.c')
| -rw-r--r-- | fs/ext2/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index 3a0a6c6406d0..3b57c9f83c9b 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -28,12 +28,12 @@ #ifdef CONFIG_FS_DAX static int ext2_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { - return dax_fault(vma, vmf, ext2_get_block); + return dax_fault(vma, vmf, ext2_get_block, NULL); } static int ext2_dax_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) { - return dax_mkwrite(vma, vmf, ext2_get_block); + return dax_mkwrite(vma, vmf, ext2_get_block, NULL); } static const struct vm_operations_struct ext2_dax_vm_ops = { |