iov_iter: advancing variants of iov_iter_get_pages{,_alloc}()

[sfrench/cifs-2.6.git] / fs / fuse / file.c

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index c982e3afe3b4e484e13975406ccfb759b4f3ecb6..69e19fc0afc17114fa3ee0d8dfd94c747864ed34 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1401,14 +1401,13 @@ static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii,
        while (nbytes < *nbytesp && ap->num_pages < max_pages) {
                unsigned npages;
                size_t start;
-               ret = iov_iter_get_pages(ii, &ap->pages[ap->num_pages],
+               ret = iov_iter_get_pages2(ii, &ap->pages[ap->num_pages],
                                        *nbytesp - nbytes,
                                        max_pages - ap->num_pages,
                                        &start);
                if (ret < 0)
                        break;
 
-               iov_iter_advance(ii, ret);
                nbytes += ret;
 
                ret += start;