Merge branch 'for-4.18/mcsafe' into libnvdimm-for-next

[linux-2.6-block.git] / drivers / dax / super.c

diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index 31b8391133996aae5992e6b2195dc07573801719..88e77b7f0c4bbcc9703791d9b04144bf4c67ce4c 100644 (file)
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -86,6 +86,7 @@ int __bdev_dax_supported(struct super_block *sb, int blocksize)
 {
        struct block_device *bdev = sb->s_bdev;
        struct dax_device *dax_dev;
+       bool dax_enabled = false;
        pgoff_t pgoff;
        int err, id;
        void *kaddr;
@@ -134,14 +135,21 @@ int __bdev_dax_supported(struct super_block *sb, int blocksize)
                 * on being able to do (page_address(pfn_to_page())).
                 */
                WARN_ON(IS_ENABLED(CONFIG_ARCH_HAS_PMEM_API));
+               dax_enabled = true;
        } else if (pfn_t_devmap(pfn)) {
-               /* pass */;
-       } else {
+               struct dev_pagemap *pgmap;
+
+               pgmap = get_dev_pagemap(pfn_t_to_pfn(pfn), NULL);
+               if (pgmap && pgmap->type == MEMORY_DEVICE_FS_DAX)
+                       dax_enabled = true;
+               put_dev_pagemap(pgmap);
+       }
+
+       if (!dax_enabled) {
                pr_debug("VFS (%s): error: dax support not enabled\n",
                                sb->s_id);
                return -EOPNOTSUPP;
        }
-
        return 0;
 }
 EXPORT_SYMBOL_GPL(__bdev_dax_supported);
@@ -182,8 +190,7 @@ static ssize_t write_cache_show(struct device *dev,
        if (!dax_dev)
                return -ENXIO;
 
-       rc = sprintf(buf, "%d\n", !!test_bit(DAXDEV_WRITE_CACHE,
-                               &dax_dev->flags));
+       rc = sprintf(buf, "%d\n", !!dax_write_cache_enabled(dax_dev));
        put_dax(dax_dev);
        return rc;
 }
@@ -201,10 +208,8 @@ static ssize_t write_cache_store(struct device *dev,
 
        if (rc)
                len = rc;
-       else if (write_cache)
-               set_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags);
        else
-               clear_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags);
+               dax_write_cache(dax_dev, write_cache);
 
        put_dax(dax_dev);
        return len;
@@ -296,7 +301,7 @@ EXPORT_SYMBOL_GPL(dax_copy_to_iter);
 void arch_wb_cache_pmem(void *addr, size_t size);
 void dax_flush(struct dax_device *dax_dev, void *addr, size_t size)
 {
-       if (unlikely(!test_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags)))
+       if (unlikely(!dax_write_cache_enabled(dax_dev)))
                return;
 
        arch_wb_cache_pmem(addr, size);