Skip to content

Commit

Permalink
libnvdimm, namespace: avoid multiple sector calculations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fabian Frederick authored and Dan Williams committed Dec 4, 2016
1 parent d37806d commit 0a3f27b
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/nvdimm/pmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 0a3f27b

Please sign in to comment.