summaryrefslogtreecommitdiffstats
path: root/include/linux/uio.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-11 22:26:51 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-11 22:26:51 -0400
commit36e9f6535f398952772df5238b23e795a2810f86 (patch)
treeee06829309dbe7ff87ed953f6e7dc7433f48cc85 /include/linux/uio.h
parenta96114fa1acaabca1091a27aacebd945a5733075 (diff)
parentbc917be8105993c256338ad1189650364a741483 (diff)
downloadop-kernel-dev-36e9f6535f398952772df5238b23e795a2810f86.zip
op-kernel-dev-36e9f6535f398952772df5238b23e795a2810f86.tar.gz
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'include/linux/uio.h')
-rw-r--r--include/linux/uio.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index a69ed25..15f11fb 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
OpenPOWER on IntegriCloud