|
@@ -294,7 +294,7 @@ static int pmem_attach_disk(struct device *dev,
|
|
|
{
|
|
|
struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev);
|
|
|
struct nd_region *nd_region = to_nd_region(dev->parent);
|
|
|
- int nid = dev_to_node(dev), fua, wbc;
|
|
|
+ int nid = dev_to_node(dev), fua;
|
|
|
struct resource *res = &nsio->res;
|
|
|
struct resource bb_res;
|
|
|
struct nd_pfn *nd_pfn = NULL;
|
|
@@ -330,7 +330,6 @@ static int pmem_attach_disk(struct device *dev,
|
|
|
dev_warn(dev, "unable to guarantee persistence of writes\n");
|
|
|
fua = 0;
|
|
|
}
|
|
|
- wbc = nvdimm_has_cache(nd_region);
|
|
|
|
|
|
if (!devm_request_mem_region(dev, res->start, resource_size(res),
|
|
|
dev_name(&ndns->dev))) {
|
|
@@ -377,7 +376,7 @@ static int pmem_attach_disk(struct device *dev,
|
|
|
return PTR_ERR(addr);
|
|
|
pmem->virt_addr = addr;
|
|
|
|
|
|
- blk_queue_write_cache(q, wbc, fua);
|
|
|
+ blk_queue_write_cache(q, true, fua);
|
|
|
blk_queue_make_request(q, pmem_make_request);
|
|
|
blk_queue_physical_block_size(q, PAGE_SIZE);
|
|
|
blk_queue_logical_block_size(q, pmem_sector_size(ndns));
|
|
@@ -408,7 +407,7 @@ static int pmem_attach_disk(struct device *dev,
|
|
|
put_disk(disk);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
- dax_write_cache(dax_dev, wbc);
|
|
|
+ dax_write_cache(dax_dev, nvdimm_has_cache(nd_region));
|
|
|
pmem->dax_dev = dax_dev;
|
|
|
|
|
|
gendev = disk_to_dev(disk);
|