Commit 3fc40265 authored by David Howells's avatar David Howells Committed by Jens Axboe

iov_iter: Kill ITER_PIPE

The ITER_PIPE-type iterator was only used by generic_file_splice_read() and
that has been replaced and removed.  This leaves ITER_PIPE unused - so
remove it too.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
cc: Jens Axboe <axboe@kernel.dk>
cc: Al Viro <viro@zeniv.linux.org.uk>
cc: David Hildenbrand <david@redhat.com>
cc: John Hubbard <jhubbard@nvidia.com>
cc: linux-mm@kvack.org
cc: linux-block@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/20230522135018.2742245-31-dhowells@redhat.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c6585011
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <uapi/linux/uio.h> #include <uapi/linux/uio.h>
struct page; struct page;
struct pipe_inode_info;
typedef unsigned int __bitwise iov_iter_extraction_t; typedef unsigned int __bitwise iov_iter_extraction_t;
...@@ -25,7 +24,6 @@ enum iter_type { ...@@ -25,7 +24,6 @@ enum iter_type {
ITER_IOVEC, ITER_IOVEC,
ITER_KVEC, ITER_KVEC,
ITER_BVEC, ITER_BVEC,
ITER_PIPE,
ITER_XARRAY, ITER_XARRAY,
ITER_DISCARD, ITER_DISCARD,
ITER_UBUF, ITER_UBUF,
...@@ -74,7 +72,6 @@ struct iov_iter { ...@@ -74,7 +72,6 @@ struct iov_iter {
const struct kvec *kvec; const struct kvec *kvec;
const struct bio_vec *bvec; const struct bio_vec *bvec;
struct xarray *xarray; struct xarray *xarray;
struct pipe_inode_info *pipe;
void __user *ubuf; void __user *ubuf;
}; };
size_t count; size_t count;
...@@ -82,10 +79,6 @@ struct iov_iter { ...@@ -82,10 +79,6 @@ struct iov_iter {
}; };
union { union {
unsigned long nr_segs; unsigned long nr_segs;
struct {
unsigned int head;
unsigned int start_head;
};
loff_t xarray_start; loff_t xarray_start;
}; };
}; };
...@@ -133,11 +126,6 @@ static inline bool iov_iter_is_bvec(const struct iov_iter *i) ...@@ -133,11 +126,6 @@ static inline bool iov_iter_is_bvec(const struct iov_iter *i)
return iov_iter_type(i) == ITER_BVEC; return iov_iter_type(i) == ITER_BVEC;
} }
static inline bool iov_iter_is_pipe(const struct iov_iter *i)
{
return iov_iter_type(i) == ITER_PIPE;
}
static inline bool iov_iter_is_discard(const struct iov_iter *i) static inline bool iov_iter_is_discard(const struct iov_iter *i)
{ {
return iov_iter_type(i) == ITER_DISCARD; return iov_iter_type(i) == ITER_DISCARD;
...@@ -286,8 +274,6 @@ void iov_iter_kvec(struct iov_iter *i, unsigned int direction, const struct kvec ...@@ -286,8 +274,6 @@ void iov_iter_kvec(struct iov_iter *i, unsigned int direction, const struct kvec
unsigned long nr_segs, size_t count); unsigned long nr_segs, size_t count);
void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struct bio_vec *bvec, void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struct bio_vec *bvec,
unsigned long nr_segs, size_t count); unsigned long nr_segs, size_t count);
void iov_iter_pipe(struct iov_iter *i, unsigned int direction, struct pipe_inode_info *pipe,
size_t count);
void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count); void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count);
void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray *xarray, void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray *xarray,
loff_t start, size_t count); loff_t start, size_t count);
......
This diff is collapsed.
...@@ -2687,8 +2687,7 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, ...@@ -2687,8 +2687,7 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter,
if (unlikely(iocb->ki_pos >= i_size_read(inode))) if (unlikely(iocb->ki_pos >= i_size_read(inode)))
break; break;
error = filemap_get_pages(iocb, iter->count, &fbatch, error = filemap_get_pages(iocb, iter->count, &fbatch, false);
iov_iter_is_pipe(iter));
if (error < 0) if (error < 0)
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment