Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / fuse / dev.c

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 0e537e580dc1e524af0a08606782bb6330b6de85..51897427a5346ed2377ec92857154601c24917e3 100644 (file)
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -730,14 +730,13 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
                }
        } else {
                size_t off;
-               err = iov_iter_get_pages(cs->iter, &page, PAGE_SIZE, 1, &off);
+               err = iov_iter_get_pages2(cs->iter, &page, PAGE_SIZE, 1, &off);
                if (err < 0)
                        return err;
                BUG_ON(!err);
                cs->len = err;
                cs->offset = off;
                cs->pg = page;
-               iov_iter_advance(cs->iter, err);
        }
 
        return lock_request(cs->req);
@@ -1356,7 +1355,7 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, struct iov_iter *to)
        if (!fud)
                return -EPERM;
 
-       if (!iter_is_iovec(to))
+       if (!user_backed_iter(to))
                return -EINVAL;
 
        fuse_copy_init(&cs, 1, to);
@@ -1949,7 +1948,7 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, struct iov_iter *from)
        if (!fud)
                return -EPERM;
 
-       if (!iter_is_iovec(from))
+       if (!user_backed_iter(from))
                return -EINVAL;
 
        fuse_copy_init(&cs, 0, from);