diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:26:51 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:26:51 -0400 |
| commit | 36e9f6535f398952772df5238b23e795a2810f86 (patch) | |
| tree | ee06829309dbe7ff87ed953f6e7dc7433f48cc85 /include | |
| parent | aio: simplify arguments of aio_setup_..._rw() (diff) | |
| parent | saner iov_iter initialization primitives (diff) | |
| download | linux-dev-36e9f6535f398952772df5238b23e795a2810f86.tar.xz linux-dev-36e9f6535f398952772df5238b23e795a2810f86.zip | |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/uio.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h index a69ed25af07f..15f11fb9fff6 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -140,4 +140,18 @@ static inline void iov_iter_reexpand(struct iov_iter *i, size_t count) size_t csum_and_copy_to_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i); size_t csum_and_copy_from_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i); +int import_iovec(int type, const struct iovec __user * uvector, + unsigned nr_segs, unsigned fast_segs, + struct iovec **iov, struct iov_iter *i); + +#ifdef CONFIG_COMPAT +struct compat_iovec; +int compat_import_iovec(int type, const struct compat_iovec __user * uvector, + unsigned nr_segs, unsigned fast_segs, + struct iovec **iov, struct iov_iter *i); +#endif + +int import_single_range(int type, void __user *buf, size_t len, + struct iovec *iov, struct iov_iter *i); + #endif |