diff --git a/fs/pipe.c b/fs/pipe.c index 75e7b3bcafed06ebdf0980000a9a8fb947055d0e..d3afb21cef2ba6d476e6e73506c4e1ecf319ca2d 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -389,7 +389,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov, const struct pipe_buf_operations *ops = buf->ops; void *addr; size_t chars = buf->len, remaining; - int error, atomic; + int error, atomic, offset; if (chars > total_len) chars = total_len; @@ -403,9 +403,10 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov, atomic = !iov_fault_in_pages_write(iov, chars); remaining = chars; + offset = buf->offset; redo: addr = ops->map(pipe, buf, atomic); - error = pipe_iov_copy_to_user(iov, addr, &buf->offset, + error = pipe_iov_copy_to_user(iov, addr, &offset, &remaining, atomic); ops->unmap(pipe, buf, addr); if (unlikely(error)) { @@ -421,6 +422,7 @@ redo: break; } ret += chars; + buf->offset += chars; buf->len -= chars; /* Was it a packet buffer? Clean up and exit */