summaryrefslogtreecommitdiffstats
path: root/fs/iomap.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2016-11-13 22:02:15 -0500
committerTheodore Ts'o <tytso@mit.edu>2016-11-13 22:02:15 -0500
commita2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e (patch)
tree643b4ba9e9f628a717d2d9741f0286842dcac28c /fs/iomap.c
parentbc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff)
parent9484ab1bf4464faae695321dd4fa66365beda74e (diff)
downloadlinux-a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e.tar.gz
linux-a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e.tar.bz2
linux-a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e.zip
Merge branch 'dax-4.10-iomap-pmd' into origin
Diffstat (limited to 'fs/iomap.c')
-rw-r--r--fs/iomap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/iomap.c b/fs/iomap.c
index a8ee8c33ca78..13dd413b2b9c 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -467,8 +467,9 @@ int iomap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
offset = page_offset(page);
while (length > 0) {
- ret = iomap_apply(inode, offset, length, IOMAP_WRITE,
- ops, page, iomap_page_mkwrite_actor);
+ ret = iomap_apply(inode, offset, length,
+ IOMAP_WRITE | IOMAP_FAULT, ops, page,
+ iomap_page_mkwrite_actor);
if (unlikely(ret <= 0))
goto out_unlock;
offset += ret;