author: Al Viro <viro@zeniv.linux.org.uk> 2021-04-23 22:24:08 -0400
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2021-07-20 16:00:16 +0200
commit: ed8c2cc773811a18f84f9f89e4662183d28177f6
parent: a3a117833731606baaed25d39aaae70a4a501221
Commit Summary:
Diffstat:
1 file changed, 2 insertions, 3 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 9eb7c31688cc..459c33c26bea 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1117,8 +1117,6 @@ static inline void pipe_truncate(struct iov_iter *i)
static void pipe_advance(struct iov_iter *i, size_t size)
{
struct pipe_inode_info *pipe = i->pipe;
- if (unlikely(i->count < size))
- size = i->count;
if (size) {
struct pipe_buffer *buf;
unsigned int p_mask = pipe->ring_size - 1;
@@ -1159,6 +1157,8 @@ static void iov_iter_bvec_advance(struct iov_iter *i, size_t size)
void iov_iter_advance(struct iov_iter *i, size_t size)
{
+ if (unlikely(i->count < size))
+ size = i->count;
if (unlikely(iov_iter_is_pipe(i))) {
pipe_advance(i, size);
return;
@@ -1168,7 +1168,6 @@ void iov_iter_advance(struct iov_iter *i, size_t size)
return;
}
if (unlikely(iov_iter_is_xarray(i))) {
- size = min(size, i->count);
i->iov_offset += size;
i->count -= size;
return;