Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index ae90cd1..153d4f3 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.
@@ -520,7 +514,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
                if (sd->len > sd->total_len)
                        sd->len = sd->total_len;
 
-               ret = buf->ops->confirm(pipe, buf);
+               ret = pipe_buf_confirm(pipe, buf);
                if (unlikely(ret)) {
                        if (ret == -ENODATA)
                                ret = 0;
@@ -759,7 +753,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
                        if (idx == pipe->buffers - 1)
                                idx = -1;
 
-                       ret = buf->ops->confirm(pipe, buf);
+                       ret = pipe_buf_confirm(pipe, buf);
                        if (unlikely(ret)) {
                                if (ret == -ENODATA)
                                        ret = 0;