Merge tag 'pull-work.iov_iter-rebased' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / net / 9p / trans_virtio.c

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 03770addaa5c98deff40435094bcdfe53b828c0a..b84d35cf68994631483f2be687ddfbe88739bd0d 100644 (file)
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -331,7 +331,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
                        if (err == -ERESTARTSYS)
                                return err;
                }
-               n = iov_iter_get_pages_alloc(data, pages, count, offs);
+               n = iov_iter_get_pages_alloc2(data, pages, count, offs);
                if (n < 0)
                        return n;
                *need_drop = 1;
@@ -373,6 +373,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
                                (*pages)[index] = kmap_to_page(p);
                        p += PAGE_SIZE;
                }
+               iov_iter_advance(data, len);
                return len;
        }
 }