diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-12 16:43:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-12 16:43:42 -0400 |
| commit | dbc2fba3fc46084f502aec53183995a632998dcd (patch) | |
| tree | a4ee9c95d40c807a133a1542d082f773661869f4 /include/linux | |
| parent | 5f739e4a491ab63730ef3b7464171340c689fbff (diff) | |
| parent | 6daef95b8c914866a46247232a048447fff97279 (diff) | |
Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull iov_iter updates from Al Viro:
"A couple of iov_iter patches - Christoph's crapectomy (the last
remaining user of iov_for_each() went away with lustre, IIRC) and
Eric'c optimization of sanity checks"
* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
iov_iter: optimize page_copy_sane()
uio: remove the unused iov_for_each macro
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/uio.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h index ecf584f6b82d..87477e1640f9 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h | |||
| @@ -110,14 +110,6 @@ static inline struct iovec iov_iter_iovec(const struct iov_iter *iter) | |||
| 110 | }; | 110 | }; |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | #define iov_for_each(iov, iter, start) \ | ||
| 114 | if (iov_iter_type(start) == ITER_IOVEC || \ | ||
| 115 | iov_iter_type(start) == ITER_KVEC) \ | ||
| 116 | for (iter = (start); \ | ||
| 117 | (iter).count && \ | ||
| 118 | ((iov = iov_iter_iovec(&(iter))), 1); \ | ||
| 119 | iov_iter_advance(&(iter), (iov).iov_len)) | ||
| 120 | |||
| 121 | size_t iov_iter_copy_from_user_atomic(struct page *page, | 113 | size_t iov_iter_copy_from_user_atomic(struct page *page, |
| 122 | struct iov_iter *i, unsigned long offset, size_t bytes); | 114 | struct iov_iter *i, unsigned long offset, size_t bytes); |
| 123 | void iov_iter_advance(struct iov_iter *i, size_t bytes); | 115 | void iov_iter_advance(struct iov_iter *i, size_t bytes); |
