Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio

[mirror_ubuntu-bionic-kernel.git] / fs / iomap.c

diff --git a/fs/iomap.c b/fs/iomap.c
index a8ee8c33ca782dbe4a4c17f42bf91fda9e83a523..13dd413b2b9c6a52e4ff0a966aff6902fc29df9a 100644 (file)
--- 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;