Merge tag 'libnvdimm-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...

[linux-2.6-microblaze.git] / fs / fuse / virtio_fs.c

diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index e54dc06..74e6271 100644 (file)
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -765,20 +765,6 @@ static long virtio_fs_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
        return nr_pages > max_nr_pages ? max_nr_pages : nr_pages;
 }
 
-static size_t virtio_fs_copy_from_iter(struct dax_device *dax_dev,
-                                      pgoff_t pgoff, void *addr,
-                                      size_t bytes, struct iov_iter *i)
-{
-       return copy_from_iter(addr, bytes, i);
-}
-
-static size_t virtio_fs_copy_to_iter(struct dax_device *dax_dev,
-                                      pgoff_t pgoff, void *addr,
-                                      size_t bytes, struct iov_iter *i)
-{
-       return copy_to_iter(addr, bytes, i);
-}
-
 static int virtio_fs_zero_page_range(struct dax_device *dax_dev,
                                     pgoff_t pgoff, size_t nr_pages)
 {
@@ -795,8 +781,6 @@ static int virtio_fs_zero_page_range(struct dax_device *dax_dev,
 
 static const struct dax_operations virtio_fs_dax_ops = {
        .direct_access = virtio_fs_direct_access,
-       .copy_from_iter = virtio_fs_copy_from_iter,
-       .copy_to_iter = virtio_fs_copy_to_iter,
        .zero_page_range = virtio_fs_zero_page_range,
 };
 
@@ -862,7 +846,7 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)
        dev_dbg(&vdev->dev, "%s: window kaddr 0x%px phys_addr 0x%llx len 0x%llx\n",
                __func__, fs->window_kaddr, cache_reg.addr, cache_reg.len);
 
-       fs->dax_dev = alloc_dax(fs, NULL, &virtio_fs_dax_ops, 0);
+       fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops);
        if (IS_ERR(fs->dax_dev))
                return PTR_ERR(fs->dax_dev);