tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iov_iter: remove iov_iter_get_pages and iov_iter_get_pages_alloc

Now that the direct I/O helpers have switched to use
iov_iter_extract_pages, these helpers are unused.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: David Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20230614140341.521331-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe 84bd06c6 e4cc6465

+7 -34
-6
include/linux/uio.h
··· 277 277 void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count); 278 278 void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray *xarray, 279 279 loff_t start, size_t count); 280 - ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages, 281 - size_t maxsize, unsigned maxpages, size_t *start, 282 - iov_iter_extraction_t extraction_flags); 283 280 ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages, 284 281 size_t maxsize, unsigned maxpages, size_t *start); 285 - ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, 286 - struct page ***pages, size_t maxsize, size_t *start, 287 - iov_iter_extraction_t extraction_flags); 288 282 ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, struct page ***pages, 289 283 size_t maxsize, size_t *start); 290 284 int iov_iter_npages(const struct iov_iter *i, int maxpages);
+7 -28
lib/iov_iter.c
··· 1082 1082 1083 1083 static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i, 1084 1084 struct page ***pages, size_t maxsize, 1085 - unsigned int maxpages, size_t *start, 1086 - iov_iter_extraction_t extraction_flags) 1085 + unsigned int maxpages, size_t *start) 1087 1086 { 1088 1087 unsigned int n, gup_flags = 0; 1089 1088 ··· 1092 1093 return 0; 1093 1094 if (maxsize > MAX_RW_COUNT) 1094 1095 maxsize = MAX_RW_COUNT; 1095 - if (extraction_flags & ITER_ALLOW_P2PDMA) 1096 - gup_flags |= FOLL_PCI_P2PDMA; 1097 1096 1098 1097 if (likely(user_backed_iter(i))) { 1099 1098 unsigned long addr; ··· 1141 1144 return -EFAULT; 1142 1145 } 1143 1146 1144 - ssize_t iov_iter_get_pages(struct iov_iter *i, 1145 - struct page **pages, size_t maxsize, unsigned maxpages, 1146 - size_t *start, iov_iter_extraction_t extraction_flags) 1147 + ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages, 1148 + size_t maxsize, unsigned maxpages, size_t *start) 1147 1149 { 1148 1150 if (!maxpages) 1149 1151 return 0; 1150 1152 BUG_ON(!pages); 1151 1153 1152 - return __iov_iter_get_pages_alloc(i, &pages, maxsize, maxpages, 1153 - start, extraction_flags); 1154 - } 1155 - EXPORT_SYMBOL_GPL(iov_iter_get_pages); 1156 - 1157 - ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages, 1158 - size_t maxsize, unsigned maxpages, size_t *start) 1159 - { 1160 - return iov_iter_get_pages(i, pages, maxsize, maxpages, start, 0); 1154 + return __iov_iter_get_pages_alloc(i, &pages, maxsize, maxpages, start); 1161 1155 } 1162 1156 EXPORT_SYMBOL(iov_iter_get_pages2); 1163 1157 1164 - ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, 1165 - struct page ***pages, size_t maxsize, 1166 - size_t *start, iov_iter_extraction_t extraction_flags) 1158 + ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, 1159 + struct page ***pages, size_t maxsize, size_t *start) 1167 1160 { 1168 1161 ssize_t len; 1169 1162 1170 1163 *pages = NULL; 1171 1164 1172 - len = __iov_iter_get_pages_alloc(i, pages, maxsize, ~0U, start, 1173 - extraction_flags); 1165 + len = __iov_iter_get_pages_alloc(i, pages, maxsize, ~0U, start); 1174 1166 if (len <= 0) { 1175 1167 kvfree(*pages); 1176 1168 *pages = NULL; 1177 1169 } 1178 1170 return len; 1179 - } 1180 - EXPORT_SYMBOL_GPL(iov_iter_get_pages_alloc); 1181 - 1182 - ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, 1183 - struct page ***pages, size_t maxsize, size_t *start) 1184 - { 1185 - return iov_iter_get_pages_alloc(i, pages, maxsize, start, 0); 1186 1171 } 1187 1172 EXPORT_SYMBOL(iov_iter_get_pages_alloc2); 1188 1173