diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 19:50:17 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 19:50:17 +0200 |
| commit | e13e75b86ef2f88e3a47d672dd4c52a293efb95b (patch) | |
| tree | 2617aebd952d1aec09d323f6b2484b93f659e753 /drivers/md/dm-stripe.c | |
| parent | Merge branch 'for-4.17/libnvdimm' into libnvdimm-for-next (diff) | |
| parent | dax, dm: allow device-mapper to operate without dax support (diff) | |
| download | linux-e13e75b86ef2f88e3a47d672dd4c52a293efb95b.tar.xz linux-e13e75b86ef2f88e3a47d672dd4c52a293efb95b.zip | |
Merge branch 'for-4.17/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/md/dm-stripe.c')
| -rw-r--r-- | drivers/md/dm-stripe.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c index b5e892149c54..ac2e8ee9d586 100644 --- a/drivers/md/dm-stripe.c +++ b/drivers/md/dm-stripe.c @@ -311,6 +311,7 @@ static int stripe_map(struct dm_target *ti, struct bio *bio) return DM_MAPIO_REMAPPED; } +#if IS_ENABLED(CONFIG_DAX_DRIVER) static long stripe_dax_direct_access(struct dm_target *ti, pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn) { @@ -351,6 +352,11 @@ static size_t stripe_dax_copy_from_iter(struct dm_target *ti, pgoff_t pgoff, return dax_copy_from_iter(dax_dev, pgoff, addr, bytes, i); } +#else +#define stripe_dax_direct_access NULL +#define stripe_dax_copy_from_iter NULL +#endif + /* * Stripe status: * |