From: Dan Williams <dan.j.williams@intel.com>
Date: Sat, 17 Dec 2016 23:08:10 +0000 (-0800)
Subject: Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c44ef859ceff45db1c72f9ccbfae96843c4b1501;p=linux-beck.git

Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
---

c44ef859ceff45db1c72f9ccbfae96843c4b1501
diff --cc drivers/nvdimm/pmem.c
index 24618431a14b,ecf79fd64517..7282d7495bf1
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@@ -53,21 -53,23 +53,24 @@@ static int pmem_clear_poison(struct pme
  	struct device *dev = to_dev(pmem);
  	sector_t sector;
  	long cleared;
+ 	int rc = 0;
  
  	sector = (offset - pmem->data_offset) / 512;
- 	cleared = nvdimm_clear_poison(dev, pmem->phys_addr + offset, len);
  
+ 	cleared = nvdimm_clear_poison(dev, pmem->phys_addr + offset, len);
+ 	if (cleared < len)
+ 		rc = -EIO;
  	if (cleared > 0 && cleared / 512) {
- 		dev_dbg(dev, "%s: %#llx clear %ld sector%s\n",
- 				__func__, (unsigned long long) sector,
- 				cleared / 512, cleared / 512 > 1 ? "s" : "");
- 		badblocks_clear(&pmem->bb, sector, cleared / 512);
- 	} else {
- 		return -EIO;
+ 		cleared /= 512;
+ 		dev_dbg(dev, "%s: %#llx clear %ld sector%s\n", __func__,
+ 				(unsigned long long) sector, cleared,
+ 				cleared > 1 ? "s" : "");
+ 		badblocks_clear(&pmem->bb, sector, cleared);
  	}
 +
  	invalidate_pmem(pmem->virt_addr + offset, len);
- 	return 0;
+ 
+ 	return rc;
  }
  
  static void write_pmem(void *pmem_addr, struct page *page,