diff mbox

[4/8,linux-next] libnvdimm, namespace: avoid multiple sector calculations

Message ID 1480706456-21111-1-git-send-email-fabf@skynet.be (mailing list archive)
State New, archived
Headers show

Commit Message

Fabian Frederick Dec. 2, 2016, 7:20 p.m. UTC
add cleared_sectors variable to add more readability.

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

Comments

Dan Williams Dec. 2, 2016, 8:05 p.m. UTC | #1
On Fri, Dec 2, 2016 at 11:20 AM, Fabian Frederick <fabf@skynet.be> wrote:
> add cleared_sectors variable to add more readability.
>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
> ---
>  drivers/nvdimm/pmem.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
> index 204912c..4da4735 100644
> --- a/drivers/nvdimm/pmem.c
> +++ b/drivers/nvdimm/pmem.c
> @@ -52,16 +52,16 @@ static int pmem_clear_poison(struct pmem_device *pmem, phys_addr_t offset,
>  {
>         struct device *dev = to_dev(pmem);
>         sector_t sector;
> -       long cleared;
> +       long cleared, cleared_sectors;
>
>         sector = (offset - pmem->data_offset) / 512;
>         cleared = nvdimm_clear_poison(dev, pmem->phys_addr + offset, len);

Let's skip adding a new 'cleared_sectors' variable and just adjust
cleared to be in terms of sectors.  Also, this patch collides with the
latest contents of libnvdimm-pending, please respin.
diff mbox

Patch

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 204912c..4da4735 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -52,16 +52,16 @@  static int pmem_clear_poison(struct pmem_device *pmem, phys_addr_t offset,
 {
 	struct device *dev = to_dev(pmem);
 	sector_t sector;
-	long cleared;
+	long cleared, cleared_sectors;
 
 	sector = (offset - pmem->data_offset) / 512;
 	cleared = nvdimm_clear_poison(dev, pmem->phys_addr + offset, len);
-
-	if (cleared > 0 && cleared / 512) {
+	cleared_sectors = cleared / 512;
+	if (cleared > 0 && cleared_sectors) {
 		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);
+			     __func__, (unsigned long long) sector,
+			     cleared_sectors, cleared_sectors > 1 ? "s" : "");
+		badblocks_clear(&pmem->bb, sector, cleared_sectors);
 	} else {
 		return -EIO;
 	}