libnvdimm, namespace: avoid multiple sector calculations
authorFabian Frederick <fabf@skynet.be>
Sun, 4 Dec 2016 18:48:58 +0000 (10:48 -0800)
committerDan Williams <dan.j.williams@intel.com>
Sun, 4 Dec 2016 18:48:58 +0000 (10:48 -0800)
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>
drivers/nvdimm/pmem.c

index 34f16a17c07bbfabbdc96a18462262faa3a52fb7..bcc359a4e64d1250055cd452050861d20017e08f 100644 (file)
@@ -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);
 }