diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 13:38:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 13:38:49 -0700 |
| commit | fed41f7d039bad02f94cad9059e4b14cd81d13f2 (patch) | |
| tree | fb9de8dfd1e706a0657e213d5d3cd9368b9e58e4 /mm | |
| parent | abb5a14fa20fdd400995926134b7be9eb8ce6048 (diff) | |
| parent | cd27e455042da85b088bdd3a6e00da1d5b4df9f1 (diff) | |
| download | op-kernel-dev-fed41f7d039bad02f94cad9059e4b14cd81d13f2.zip op-kernel-dev-fed41f7d039bad02f94cad9059e4b14cd81d13f2.tar.gz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 2f7b778..849f459 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); } |
