Merge tag 'leds-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux...

[linux.git] / fs / iomap / buffered-io.c

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 828444e14d09a855785a9baf9b986f4e35271979..7c84c4c027c4943e987aa30f6760116b27edc751 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1077,24 +1077,16 @@ vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)
        struct page *page = vmf->page;
        struct inode *inode = file_inode(vmf->vma->vm_file);
        unsigned long length;
-       loff_t offset, size;
+       loff_t offset;
        ssize_t ret;
 
        lock_page(page);
-       size = i_size_read(inode);
-       offset = page_offset(page);
-       if (page->mapping != inode->i_mapping || offset > size) {
-               /* We overload EFAULT to mean page got truncated */
-               ret = -EFAULT;
+       ret = page_mkwrite_check_truncate(page, inode);
+       if (ret < 0)
                goto out_unlock;
-       }
-
-       /* page is wholly or partially inside EOF */
-       if (offset > size - PAGE_SIZE)
-               length = offset_in_page(size);
-       else
-               length = PAGE_SIZE;
+       length = ret;
 
+       offset = page_offset(page);
        while (length > 0) {
                ret = iomap_apply(inode, offset, length,
                                IOMAP_WRITE | IOMAP_FAULT, ops, page,