Merge tag 'fuse-update-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

[platform/kernel/linux-rpi.git] / fs / fuse / virtio_fs.c

diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index f9c1aa1..21a9e53 100644 (file)
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -833,11 +833,11 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)
         * initialize a struct resource from scratch (only the start
         * and end fields will be used).
         */
-       pgmap->res = (struct resource){
-               .name = "virtio-fs dax window",
+       pgmap->range = (struct range) {
                .start = (phys_addr_t) cache_reg.addr,
                .end = (phys_addr_t) cache_reg.addr + cache_reg.len - 1,
        };
+       pgmap->nr_range = 1;
 
        fs->window_kaddr = devm_memremap_pages(&vdev->dev, pgmap);
        if (IS_ERR(fs->window_kaddr))