summaryrefslogtreecommitdiff
path: root/mm/filemap.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-10-10 13:26:27 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-10-10 13:36:06 -0400
commitc3a690240423fc4eb8a0c3c7df025d13eadf140b (patch)
tree20f4a32910427c2aa4ccf8e33633d6e7194628bf /mm/filemap.c
parenta949e63992469fed87aef197347960ced31701b8 (diff)
downloadlwn-c3a690240423fc4eb8a0c3c7df025d13eadf140b.tar.gz
lwn-c3a690240423fc4eb8a0c3c7df025d13eadf140b.zip
fix ITER_PIPE interaction with direct_IO
by making sure we call iov_iter_advance() on original iov_iter even if direct_IO (done on its copy) has returned 0. It's a no-op for old iov_iter flavours and does the right thing (== truncation of the stuff we'd allocated, but not filled) in ITER_PIPE case. Failures (e.g. -EIO) get caught and dealt with by cleanup in generic_file_read_iter(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm/filemap.c')
-rw-r--r--mm/filemap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 8a287dfc5372..6b965efe215e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1920,7 +1920,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
retval = mapping->a_ops->direct_IO(iocb, &data);
}
- if (retval > 0) {
+ if (retval >= 0) {
iocb->ki_pos += retval;
iov_iter_advance(iter, retval);
}