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

[mirror_ubuntu-artful-kernel.git] / drivers / md / dm-linear.c

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index a5120961632a7d63d76e4fd8a24a3116394cacff..7d42a9d9f406b713448e75822669cd4e23b1b966 100644 (file)
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/bio.h>
+#include <linux/dax.h>
 #include <linux/slab.h>
 #include <linux/device-mapper.h>
 
@@ -142,22 +143,20 @@ static int linear_iterate_devices(struct dm_target *ti,
        return fn(ti, lc->dev, lc->start, ti->len, data);
 }
 
-static long linear_direct_access(struct dm_target *ti, sector_t sector,
-                                void **kaddr, pfn_t *pfn, long size)
+static long linear_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,
+               long nr_pages, void **kaddr, pfn_t *pfn)
 {
+       long ret;
        struct linear_c *lc = ti->private;
        struct block_device *bdev = lc->dev->bdev;
-       struct blk_dax_ctl dax = {
-               .sector = linear_map_sector(ti, sector),
-               .size = size,
-       };
-       long ret;
-
-       ret = bdev_direct_access(bdev, &dax);
-       *kaddr = dax.addr;
-       *pfn = dax.pfn;
-
-       return ret;
+       struct dax_device *dax_dev = lc->dev->dax_dev;
+       sector_t dev_sector, sector = pgoff * PAGE_SECTORS;
+
+       dev_sector = linear_map_sector(ti, sector);
+       ret = bdev_dax_pgoff(bdev, dev_sector, nr_pages * PAGE_SIZE, &pgoff);
+       if (ret)
+               return ret;
+       return dax_direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn);
 }
 
 static struct target_type linear_target = {
@@ -171,7 +170,7 @@ static struct target_type linear_target = {
        .status = linear_status,
        .prepare_ioctl = linear_prepare_ioctl,
        .iterate_devices = linear_iterate_devices,
-       .direct_access = linear_direct_access,
+       .direct_access = linear_dax_direct_access,
 };
 
 int __init dm_linear_init(void)