dax: Use dax_write_cache* helpers
authorRoss Zwisler <ross.zwisler@linux.intel.com>
Wed, 6 Jun 2018 16:45:14 +0000 (10:45 -0600)
committerDan Williams <dan.j.williams@intel.com>
Wed, 6 Jun 2018 18:02:34 +0000 (11:02 -0700)
Use dax_write_cache() and dax_write_cache_enabled() instead of open coding
the bit operations.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/dax/super.c

index 2b2332b..c2c46f9 100644 (file)
@@ -182,8 +182,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 +200,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;
@@ -286,7 +283,7 @@ EXPORT_SYMBOL_GPL(dax_copy_from_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);