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 /include/linux/device-mapper.h | |
| parent | d5483feda85a8f39ee2e940e279547c686aac30c (diff) | |
| parent | 1ef97fe4f8abd3317d5c3c860f990e02c2633959 (diff) | |
| download | op-kernel-dev-736163671bcb163fc82600b46c83dfa89d532d95.zip op-kernel-dev-736163671bcb163fc82600b46c83dfa89d532d95.tar.gz | |
Merge branch 'for-4.12/dax' into libnvdimm-for-next
Diffstat (limited to 'include/linux/device-mapper.h')
| -rw-r--r-- | include/linux/device-mapper.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index a7e6903..df830d1 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -128,13 +128,15 @@ typedef int (*dm_busy_fn) (struct dm_target *ti); * < 0 : error * >= 0 : the number of bytes accessible at the address */ -typedef long (*dm_direct_access_fn) (struct dm_target *ti, sector_t sector, - void **kaddr, pfn_t *pfn, long size); +typedef long (*dm_dax_direct_access_fn) (struct dm_target *ti, pgoff_t pgoff, + long nr_pages, void **kaddr, pfn_t *pfn); +#define PAGE_SECTORS (PAGE_SIZE / 512) void dm_error(const char *message); struct dm_dev { struct block_device *bdev; + struct dax_device *dax_dev; fmode_t mode; char name[16]; }; @@ -176,7 +178,7 @@ struct target_type { dm_busy_fn busy; dm_iterate_devices_fn iterate_devices; dm_io_hints_fn io_hints; - dm_direct_access_fn direct_access; + dm_dax_direct_access_fn direct_access; /* For internal device-mapper use. */ struct list_head list; |
