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

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);
                 }