Commit a060c940 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'write-page-prefaulting' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

Pull iomap fixlet from Andreas Gruenbacher:
 "Fix buffered write page prefaulting.

  I forgot to send it the previous merge window. I've only improved the
  patch description since"

* tag 'write-page-prefaulting' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  fs/iomap: Fix buffered write page prefaulting
parents b06a1758 631f871f
...@@ -765,7 +765,7 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i) ...@@ -765,7 +765,7 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i)
* same page as we're writing to, without it being marked * same page as we're writing to, without it being marked
* up-to-date. * up-to-date.
*/ */
if (unlikely(fault_in_iov_iter_readable(i, bytes))) { if (unlikely(fault_in_iov_iter_readable(i, bytes) == bytes)) {
status = -EFAULT; status = -EFAULT;
break; break;
} }
......
...@@ -3779,7 +3779,7 @@ ssize_t generic_perform_write(struct file *file, ...@@ -3779,7 +3779,7 @@ ssize_t generic_perform_write(struct file *file,
* same page as we're writing to, without it being marked * same page as we're writing to, without it being marked
* up-to-date. * up-to-date.
*/ */
if (unlikely(fault_in_iov_iter_readable(i, bytes))) { if (unlikely(fault_in_iov_iter_readable(i, bytes) == bytes)) {
status = -EFAULT; status = -EFAULT;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment