diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-05-04 23:38:43 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-05-04 23:38:43 -0700 |
| commit | 736163671bcb163fc82600b46c83dfa89d532d95 (patch) | |
| tree | 0639dc9d9fa180450b4e8fbda706eaae5f1876da /drivers/md/dm-linear.c | |
| parent | d5483feda85a8f39ee2e940e279547c686aac30c (diff) | |
| parent | 1ef97fe4f8abd3317d5c3c860f990e02c2633959 (diff) | |
Merge branch 'for-4.12/dax' into libnvdimm-for-nextlibnvdimm-for-4.12
Diffstat (limited to 'drivers/md/dm-linear.c')
| -rw-r--r-- | drivers/md/dm-linear.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c index 4788b0b989a9..c5a52f4dae81 100644 --- 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> @@ -141,22 +142,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 = { @@ -169,7 +168,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) |