提交 c3a69024 编写于 作者: A Al Viro

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: NAl Viro <viro@zeniv.linux.org.uk>
上级 a949e639
...@@ -315,15 +315,9 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, ...@@ -315,15 +315,9 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
*ppos = kiocb.ki_pos; *ppos = kiocb.ki_pos;
file_accessed(in); file_accessed(in);
} else if (ret < 0) { } else if (ret < 0) {
if (WARN_ON(to.idx != idx || to.iov_offset)) { to.idx = idx;
/* to.iov_offset = 0;
* a bogus ->read_iter() has copied something and still iov_iter_advance(&to, 0); /* to free what was emitted */
* 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 */
}
/* /*
* callers of ->splice_read() expect -EAGAIN on * callers of ->splice_read() expect -EAGAIN on
* "can't put anything in there", rather than -EFAULT. * "can't put anything in there", rather than -EFAULT.
......
...@@ -317,7 +317,7 @@ xfs_file_dio_aio_read( ...@@ -317,7 +317,7 @@ xfs_file_dio_aio_read(
data = *to; data = *to;
ret = __blockdev_direct_IO(iocb, inode, target->bt_bdev, &data, ret = __blockdev_direct_IO(iocb, inode, target->bt_bdev, &data,
xfs_get_blocks_direct, NULL, NULL, 0); xfs_get_blocks_direct, NULL, NULL, 0);
if (ret > 0) { if (ret >= 0) {
iocb->ki_pos += ret; iocb->ki_pos += ret;
iov_iter_advance(to, ret); iov_iter_advance(to, ret);
} }
......
...@@ -1920,7 +1920,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) ...@@ -1920,7 +1920,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
retval = mapping->a_ops->direct_IO(iocb, &data); retval = mapping->a_ops->direct_IO(iocb, &data);
} }
if (retval > 0) { if (retval >= 0) {
iocb->ki_pos += retval; iocb->ki_pos += retval;
iov_iter_advance(iter, retval); iov_iter_advance(iter, retval);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册