summaryrefslogtreecommitdiffstats
path: root/lib/iov_iter.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-03-25 18:47:28 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-03-28 18:24:05 -0400
commit3f763453e6f27d82fa0ac58f8e1ac4094c1fb1f8 (patch)
tree66b4a1ef1f7d7b9573cf8ff53da4b48690a588e0 /lib/iov_iter.c
parent122b05ddf506e637336dcf64b5a129825f7bf6d4 (diff)
downloadlinux-stable-3f763453e6f27d82fa0ac58f8e1ac4094c1fb1f8.tar.gz
linux-stable-3f763453e6f27d82fa0ac58f8e1ac4094c1fb1f8.tar.bz2
linux-stable-3f763453e6f27d82fa0ac58f8e1ac4094c1fb1f8.zip
kill __copy_from_user_nocache()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'lib/iov_iter.c')
-rw-r--r--lib/iov_iter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 97db876c6862..672c32f9f960 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -604,7 +604,7 @@ size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i)
return 0;
}
iterate_and_advance(i, bytes, v,
- __copy_from_user_nocache((to += v.iov_len) - v.iov_len,
+ __copy_from_user_inatomic_nocache((to += v.iov_len) - v.iov_len,
v.iov_base, v.iov_len),
memcpy_from_page((to += v.bv_len) - v.bv_len, v.bv_page,
v.bv_offset, v.bv_len),
@@ -625,7 +625,7 @@ bool copy_from_iter_full_nocache(void *addr, size_t bytes, struct iov_iter *i)
if (unlikely(i->count < bytes))
return false;
iterate_all_kinds(i, bytes, v, ({
- if (__copy_from_user_nocache((to += v.iov_len) - v.iov_len,
+ if (__copy_from_user_inatomic_nocache((to += v.iov_len) - v.iov_len,
v.iov_base, v.iov_len))
return false;
0;}),