summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-10 13:38:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-10 13:38:49 -0700
commitfed41f7d039bad02f94cad9059e4b14cd81d13f2 (patch)
treefb9de8dfd1e706a0657e213d5d3cd9368b9e58e4 /mm
parentabb5a14fa20fdd400995926134b7be9eb8ce6048 (diff)
parentcd27e455042da85b088bdd3a6e00da1d5b4df9f1 (diff)
downloadlinux-fed41f7d039bad02f94cad9059e4b14cd81d13f2.tar.gz
linux-fed41f7d039bad02f94cad9059e4b14cd81d13f2.tar.bz2
linux-fed41f7d039bad02f94cad9059e4b14cd81d13f2.zip
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull splice fixups from Al Viro: "A couple of fixups for interaction of pipe-backed iov_iter with O_DIRECT reads + constification of a couple of primitives in uio.h missed by previous rounds. Kudos to davej - his fuzzing has caught those bugs" * 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: [btrfs] fix check_direct_IO() for non-iovec iterators constify iov_iter_count() and iter_is_iovec() fix ITER_PIPE interaction with direct_IO
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 2f7b7783bd6b..849f459ad078 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1941,7 +1941,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
file_accessed(file);
retval = mapping->a_ops->direct_IO(iocb, &data);
- if (retval > 0) {
+ if (retval >= 0) {
iocb->ki_pos += retval;
iov_iter_advance(iter, retval);
}