summaryrefslogtreecommitdiffstats
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-04-10 20:54:51 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:32:42 -0400
commite7c24607b5d68a4cdc56e09d70a3c8bae5f0519f (patch)
tree65b8b65636ba6d2470d3a004d027ff966811d270 /fs/cifs/file.c
parentf6c0a1920e0180175bd5e8e4aff8ea5556f1895d (diff)
downloadlinux-e7c24607b5d68a4cdc56e09d70a3c8bae5f0519f.tar.gz
linux-e7c24607b5d68a4cdc56e09d70a3c8bae5f0519f.tar.bz2
linux-e7c24607b5d68a4cdc56e09d70a3c8bae5f0519f.zip
kill iov_iter_copy_from_user()
all callers can use copy_page_from_iter() and it actually simplifies them. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r--fs/cifs/file.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 5ed03e0b8b40..2900d150654e 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2444,11 +2444,10 @@ cifs_iovec_write(struct file *file, const struct iovec *iov,
save_len = cur_len;
for (i = 0; i < nr_pages; i++) {
- bytes = min_t(const size_t, cur_len, PAGE_SIZE);
- copied = iov_iter_copy_from_user(wdata->pages[i], &it,
- 0, bytes);
+ bytes = min_t(size_t, cur_len, PAGE_SIZE);
+ copied = copy_page_from_iter(wdata->pages[i], 0, bytes,
+ &it);
cur_len -= copied;
- iov_iter_advance(&it, copied);
/*
* If we didn't copy as much as we expected, then that
* may mean we trod into an unmapped area. Stop copying