[PATCH 3/8 linux-next] libnvdimm, namespace: move persistence warning

From: Fabian Frederick
Date: Fri Dec 02 2016 - 14:20:43 EST


There's no need to warn on persistence yet as some validity tests
are on the way.

Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
---
drivers/nvdimm/pmem.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 822a712..204912c 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -266,9 +266,6 @@ static int pmem_attach_disk(struct device *dev,
dev_set_drvdata(dev, pmem);
pmem->phys_addr = res->start;
pmem->size = resource_size(res);
- if (nvdimm_has_flush(nd_region) < 0)
- dev_warn(dev, "unable to guarantee persistence of writes due to unknown flushing capability of the memory region\n");
-
if (!devm_request_mem_region(dev, res->start, resource_size(res),
dev_name(dev))) {
dev_warn(dev, "could not reserve region %pR\n", res);
@@ -279,6 +276,9 @@ static int pmem_attach_disk(struct device *dev,
if (!q)
return -ENOMEM;

+ if (nvdimm_has_flush(nd_region) < 0)
+ dev_warn(dev, "unable to guarantee persistence of writes due to unknown flushing capability of the memory region\n");
+
pmem->pfn_flags = PFN_DEV;
if (is_nd_pfn(dev)) {
addr = devm_memremap_pages(dev, &pfn_res, &q->q_usage_counter,
--
2.7.4