diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-11-13 22:02:15 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-11-13 22:02:15 -0500 |
| commit | a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e (patch) | |
| tree | 643b4ba9e9f628a717d2d9741f0286842dcac28c /fs/iomap.c | |
| parent | bc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff) | |
| parent | 9484ab1bf4464faae695321dd4fa66365beda74e (diff) | |
| download | linux-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.c | 5 |
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; |