diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-11-16 03:56:11 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-11-16 03:56:11 +0300 |
| commit | 4247f24c23589bcc3bc3490515ef8c9497e9ae55 (patch) | |
| tree | 89726a0e171c443a3e8def2992b56dbd8a21df21 /fs/ext2 | |
| parent | 79ab67ede21f536851a99ea68ee6fc1f5435e055 (diff) | |
| parent | 9f586fff6574f6ecbf323f92d44ffaf0d96225fe (diff) | |
| download | linux-4247f24c23589bcc3bc3490515ef8c9497e9ae55.tar.xz | |
Merge branch 'for-4.15/dax' into libnvdimm-for-next
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index ff3a3636a5ca..d2bb7c96307d 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -99,7 +99,7 @@ static int ext2_dax_fault(struct vm_fault *vmf) } down_read(&ei->dax_sem); - ret = dax_iomap_fault(vmf, PE_SIZE_PTE, &ext2_iomap_ops); + ret = dax_iomap_fault(vmf, PE_SIZE_PTE, NULL, &ext2_iomap_ops); up_read(&ei->dax_sem); if (vmf->flags & FAULT_FLAG_WRITE) |