diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-06-06 12:45:14 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2018-06-06 14:02:34 -0400 |
commit | 808c340be17dc77131fcdf9ad1eb34452d650da1 (patch) | |
tree | 54cdace8155c87dbc75a9db2afd0a24768f41eea /drivers/dax | |
parent | 546eb0317cfa3c4f9e1d9ab892766d65d7f78fad (diff) |
dax: Use dax_write_cache* helpers
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>
Diffstat (limited to 'drivers/dax')
-rw-r--r-- | drivers/dax/super.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 2b2332b605e4..c2c46f96b18c 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c | |||
@@ -182,8 +182,7 @@ static ssize_t write_cache_show(struct device *dev, | |||
182 | if (!dax_dev) | 182 | if (!dax_dev) |
183 | return -ENXIO; | 183 | return -ENXIO; |
184 | 184 | ||
185 | rc = sprintf(buf, "%d\n", !!test_bit(DAXDEV_WRITE_CACHE, | 185 | rc = sprintf(buf, "%d\n", !!dax_write_cache_enabled(dax_dev)); |
186 | &dax_dev->flags)); | ||
187 | put_dax(dax_dev); | 186 | put_dax(dax_dev); |
188 | return rc; | 187 | return rc; |
189 | } | 188 | } |
@@ -201,10 +200,8 @@ static ssize_t write_cache_store(struct device *dev, | |||
201 | 200 | ||
202 | if (rc) | 201 | if (rc) |
203 | len = rc; | 202 | len = rc; |
204 | else if (write_cache) | ||
205 | set_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags); | ||
206 | else | 203 | else |
207 | clear_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags); | 204 | dax_write_cache(dax_dev, write_cache); |
208 | 205 | ||
209 | put_dax(dax_dev); | 206 | put_dax(dax_dev); |
210 | return len; | 207 | return len; |
@@ -286,7 +283,7 @@ EXPORT_SYMBOL_GPL(dax_copy_from_iter); | |||
286 | void arch_wb_cache_pmem(void *addr, size_t size); | 283 | void arch_wb_cache_pmem(void *addr, size_t size); |
287 | void dax_flush(struct dax_device *dax_dev, void *addr, size_t size) | 284 | void dax_flush(struct dax_device *dax_dev, void *addr, size_t size) |
288 | { | 285 | { |
289 | if (unlikely(!test_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags))) | 286 | if (unlikely(!dax_write_cache_enabled(dax_dev))) |
290 | return; | 287 | return; |
291 | 288 | ||
292 | arch_wb_cache_pmem(addr, size); | 289 | arch_wb_cache_pmem(addr, size); |