Merge tag 'fs.setgid.v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner...

[mirror_ubuntu-kernels.git] / fs / ceph / file.c

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 5a0266ea66ff6bf6618af581975aecf188648cf2..284d2fda663deb8b4a20c9edcfb03d2dd78bd7c8 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -95,12 +95,11 @@ static ssize_t __iter_get_bvecs(struct iov_iter *iter, size_t maxsize,
                size_t start;
                int idx = 0;
 
-               bytes = iov_iter_get_pages(iter, pages, maxsize - size,
+               bytes = iov_iter_get_pages2(iter, pages, maxsize - size,
                                           ITER_GET_BVECS_PAGES, &start);
                if (bytes < 0)
                        return size ?: bytes;
 
-               iov_iter_advance(iter, bytes);
                size += bytes;
 
                for ( ; bytes; idx++, bvec_idx++) {
@@ -1258,7 +1257,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
        size_t count = iov_iter_count(iter);
        loff_t pos = iocb->ki_pos;
        bool write = iov_iter_rw(iter) == WRITE;
-       bool should_dirty = !write && iter_is_iovec(iter);
+       bool should_dirty = !write && user_backed_iter(iter);
 
        if (write && ceph_snap(file_inode(file)) != CEPH_NOSNAP)
                return -EROFS;