From: Fabian Frederick <fabf@skynet.be>
Date: Sun, 4 Dec 2016 18:48:58 +0000 (-0800)
Subject: libnvdimm, namespace: avoid multiple sector calculations
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a3f27b9a6a8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

libnvdimm, namespace: avoid multiple sector calculations

Use sector_t for cleared

Suggested-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 34f16a17c07b..bcc359a4e64d 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -51,17 +51,16 @@ static void pmem_clear_poison(struct pmem_device *pmem, phys_addr_t offset,
 		unsigned int len)
 {
 	struct device *dev = to_dev(pmem);
-	sector_t sector;
-	long cleared;
+	sector_t sector, cleared;
 
 	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) / 512;
 
-	if (cleared > 0 && cleared / 512) {
+	if (cleared) {
 		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);
+				cleared, cleared > 1 ? "s" : "");
+		badblocks_clear(&pmem->bb, sector, cleared);
 	}
 	invalidate_pmem(pmem->virt_addr + offset, len);
 }