aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2023-04-03 16:25:41 +0200
committerJens Axboe <axboe@kernel.dk>2023-04-05 07:34:38 -0600
commitb6eaf73268c819c170266ba1b83e4d08f973aea5 (patch)
tree6fee715c51e94ec36c555d2a6a4c6e1a21a198d6
parentd187b44bc9404581bad8d006d80937d1b3a2b0c0 (diff)
downloadmisc-b6eaf73268c819c170266ba1b83e4d08f973aea5.tar.gz
iov_iter: remove iov_iter_get_pages
All previous users have been converted to the FOLL_PIN based interfaces. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230403142543.1913749-2-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--include/linux/uio.h3
-rw-r--r--lib/iov_iter.c14
2 files changed, 3 insertions, 14 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 74598426edb405..37f93a613f3dc7 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -238,9 +238,6 @@ void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struct bio_
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,
loff_t start, size_t count);
-ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages,
- size_t maxsize, unsigned maxpages, size_t *start,
- iov_iter_extraction_t extraction_flags);
ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
size_t maxsize, unsigned maxpages, size_t *start);
ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index fad95e4cf372a2..07872e30ee82e3 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1081,23 +1081,15 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i,
return -EFAULT;
}
-ssize_t iov_iter_get_pages(struct iov_iter *i,
- struct page **pages, size_t maxsize, unsigned maxpages,
- size_t *start, iov_iter_extraction_t extraction_flags)
+ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
+ size_t maxsize, unsigned maxpages, size_t *start)
{
if (!maxpages)
return 0;
BUG_ON(!pages);
return __iov_iter_get_pages_alloc(i, &pages, maxsize, maxpages,
- start, extraction_flags);
-}
-EXPORT_SYMBOL_GPL(iov_iter_get_pages);
-
-ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
- size_t maxsize, unsigned maxpages, size_t *start)
-{
- return iov_iter_get_pages(i, pages, maxsize, maxpages, start, 0);
+ start, 0);
}
EXPORT_SYMBOL(iov_iter_get_pages2);