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>

diff --git a/fs/splice.c b/fs/splice.c
index aa38901a4f101a963861e8cc0e211918ffa9c5bc..153d4f3bd441febd7004b1862cd218afc0ee6252 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -315,15 +315,9 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
                *ppos = kiocb.ki_pos;
                file_accessed(in);
        } else if (ret < 0) {
-               if (WARN_ON(to.idx != idx || to.iov_offset)) {
-                       /*
-                        * a bogus ->read_iter() has copied something and still
-                        * returned an error instead of a short read.
-                        */
-                       to.idx = idx;
-                       to.iov_offset = 0;
-                       iov_iter_advance(&to, 0); /* to free what was emitted */
-               }
+               to.idx = idx;
+               to.iov_offset = 0;
+               iov_iter_advance(&to, 0); /* to free what was emitted */
                /*
                 * callers of ->splice_read() expect -EAGAIN on
                 * "can't put anything in there", rather than -EFAULT.

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 92f16cfb81e8c06952f39f7d23740d7f6f6b5a62..26cf153e37144c208327bfecb7c8340bf72994b4 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -317,7 +317,7 @@ xfs_file_dio_aio_read(
        data = *to;
        ret = __blockdev_direct_IO(iocb, inode, target->bt_bdev, &data,
                        xfs_get_blocks_direct, NULL, NULL, 0);
-       if (ret > 0) {
+       if (ret >= 0) {
                iocb->ki_pos += ret;
                iov_iter_advance(to, ret);
        }

diff --git a/mm/filemap.c b/mm/filemap.c
index 8a287dfc53722c724fa3ec21992609fa2a8c3c58..6b965efe215e80696a52d73bebe26b4b64bf902c 100644 (file)
--- 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);
                }