diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 10:50:17 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 10:50:17 -0700 |
| commit | e13e75b86ef2f88e3a47d672dd4c52a293efb95b (patch) | |
| tree | 2617aebd952d1aec09d323f6b2484b93f659e753 /drivers/dax | |
| parent | 1ed41b5696ccc3ff40a1dee39fe14eff273faf82 (diff) | |
| parent | 976431b02c2ef92ae3f8b6a7d699fc554025e118 (diff) | |
| download | linux-e13e75b86ef2f88e3a47d672dd4c52a293efb95b.tar.gz linux-e13e75b86ef2f88e3a47d672dd4c52a293efb95b.tar.bz2 linux-e13e75b86ef2f88e3a47d672dd4c52a293efb95b.zip | |
Merge branch 'for-4.17/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/dax/super.c | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/drivers/dax/Kconfig b/drivers/dax/Kconfig index b79aa8f7a497..e0700bf4893a 100644 --- a/drivers/dax/Kconfig +++ b/drivers/dax/Kconfig @@ -1,3 +1,7 @@ +config DAX_DRIVER + select DAX + bool + menuconfig DAX tristate "DAX: direct access to differentiated memory" select SRCU @@ -16,7 +20,6 @@ config DEV_DAX baseline memory pool. Mappings of a /dev/daxX.Y device impose restrictions that make the mapping behavior deterministic. - config DEV_DAX_PMEM tristate "PMEM DAX: direct access to persistent memory" depends on LIBNVDIMM && NVDIMM_DAX && DEV_DAX diff --git a/drivers/dax/super.c b/drivers/dax/super.c index ecdc292aa4e4..2b2332b605e4 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -124,10 +124,19 @@ int __bdev_dax_supported(struct super_block *sb, int blocksize) return len < 0 ? len : -EIO; } - if ((IS_ENABLED(CONFIG_FS_DAX_LIMITED) && pfn_t_special(pfn)) - || pfn_t_devmap(pfn)) + if (IS_ENABLED(CONFIG_FS_DAX_LIMITED) && pfn_t_special(pfn)) { + /* + * An arch that has enabled the pmem api should also + * have its drivers support pfn_t_devmap() + * + * This is a developer warning and should not trigger in + * production. dax_flush() will crash since it depends + * on being able to do (page_address(pfn_to_page())). + */ + WARN_ON(IS_ENABLED(CONFIG_ARCH_HAS_PMEM_API)); + } else if (pfn_t_devmap(pfn)) { /* pass */; - else { + } else { pr_debug("VFS (%s): error: dax support not enabled\n", sb->s_id); return -EOPNOTSUPP; |