summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-03-26 12:41:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-03-26 12:41:52 -0700
commita060c9409e25d573c23fccb8e02f098aa33f812e (patch)
tree71c107fa653cc1e02ac0e1b7971b2c14eb0d7465 /mm
parentb06a17583f6f810f620f95382b171cc5ce9848ee (diff)
parent631f871f071746789e9242e514ab0f49067fa97a (diff)
downloadlinux-a060c9409e25d573c23fccb8e02f098aa33f812e.tar.bz2
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
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 8426434042f4..647d72bf23b6 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3779,7 +3779,7 @@ again:
* same page as we're writing to, without it being marked
* up-to-date.
*/
- if (unlikely(fault_in_iov_iter_readable(i, bytes))) {
+ if (unlikely(fault_in_iov_iter_readable(i, bytes) == bytes)) {
status = -EFAULT;
break;
}