Skip to content

Commit 3fc4026

Browse files
dhowellsaxboe
authored andcommitted
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: David Howells <dhowells@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Christian 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.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent c658501 commit 3fc4026

File tree

3 files changed

+4
-444
lines changed

3 files changed

+4
-444
lines changed

include/linux/uio.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <uapi/linux/uio.h>
1212

1313
struct page;
14-
struct pipe_inode_info;
1514

1615
typedef unsigned int __bitwise iov_iter_extraction_t;
1716

@@ -25,7 +24,6 @@ enum iter_type {
2524
ITER_IOVEC,
2625
ITER_KVEC,
2726
ITER_BVEC,
28-
ITER_PIPE,
2927
ITER_XARRAY,
3028
ITER_DISCARD,
3129
ITER_UBUF,
@@ -74,18 +72,13 @@ struct iov_iter {
7472
const struct kvec *kvec;
7573
const struct bio_vec *bvec;
7674
struct xarray *xarray;
77-
struct pipe_inode_info *pipe;
7875
void __user *ubuf;
7976
};
8077
size_t count;
8178
};
8279
};
8380
union {
8481
unsigned long nr_segs;
85-
struct {
86-
unsigned int head;
87-
unsigned int start_head;
88-
};
8982
loff_t xarray_start;
9083
};
9184
};
@@ -133,11 +126,6 @@ static inline bool iov_iter_is_bvec(const struct iov_iter *i)
133126
return iov_iter_type(i) == ITER_BVEC;
134127
}
135128

136-
static inline bool iov_iter_is_pipe(const struct iov_iter *i)
137-
{
138-
return iov_iter_type(i) == ITER_PIPE;
139-
}
140-
141129
static inline bool iov_iter_is_discard(const struct iov_iter *i)
142130
{
143131
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
286274
unsigned long nr_segs, size_t count);
287275
void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struct bio_vec *bvec,
288276
unsigned long nr_segs, size_t count);
289-
void iov_iter_pipe(struct iov_iter *i, unsigned int direction, struct pipe_inode_info *pipe,
290-
size_t count);
291277
void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count);
292278
void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray *xarray,
293279
loff_t start, size_t count);

0 commit comments

Comments
 (0)