summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-09-17 18:02:44 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-09-27 18:12:24 -0400
commit4bce9f6ee8f84fdf333d0fd7fcf7f0d8c7cce7fa (patch)
treea5d3f51f67b05e37d3de3ed9201794924b66efc2 /lib
parent08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff)
downloadlinux-4bce9f6ee8f84fdf333d0fd7fcf7f0d8c7cce7fa.tar.gz
linux-4bce9f6ee8f84fdf333d0fd7fcf7f0d8c7cce7fa.tar.bz2
linux-4bce9f6ee8f84fdf333d0fd7fcf7f0d8c7cce7fa.zip
get rid of separate multipage fault-in primitives
* the only remaining callers of "short" fault-ins are just as happy with generic variants (both in lib/iov_iter.c); switch them to multipage variants, kill the "short" ones * rename the multipage variants to now available plain ones. * get rid of compat macro defining iov_iter_fault_in_multipage_readable by expanding it in its only user. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'lib')
-rw-r--r--lib/iov_iter.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 7e3138cfc8c9..ce4632002611 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -306,8 +306,7 @@ int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes)
if (!(i->type & (ITER_BVEC|ITER_KVEC))) {
iterate_iovec(i, bytes, v, iov, skip, ({
- err = fault_in_multipages_readable(v.iov_base,
- v.iov_len);
+ err = fault_in_pages_readable(v.iov_base, v.iov_len);
if (unlikely(err))
return err;
0;}))