libnvdimm: fix clear length of nvdimm_forget_poison()
authorToshi Kani <toshi.kani@hpe.com>
Thu, 27 Apr 2017 22:57:05 +0000 (16:57 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 May 2017 13:44:38 +0000 (15:44 +0200)
commit 8d13c0290655b883df9083a2a0af0d782bc38aef upstream.

ND_CMD_CLEAR_ERROR command returns 'clear_err.cleared', the length
of error actually cleared, which may be smaller than its requested
'len'.

Change nvdimm_clear_poison() to call nvdimm_forget_poison() with
'clear_err.cleared' when this value is valid.

Fixes: e046114af5fc ("libnvdimm: clear the internal poison_list when clearing badblocks")
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nvdimm/bus.c

index 351bac8..0392eb8 100644 (file)
@@ -218,7 +218,10 @@ long nvdimm_clear_poison(struct device *dev, phys_addr_t phys,
        if (cmd_rc < 0)
                return cmd_rc;
 
-       nvdimm_clear_from_poison_list(nvdimm_bus, phys, len);
+       if (clear_err.cleared > 0)
+               nvdimm_clear_from_poison_list(nvdimm_bus, phys,
+                                             clear_err.cleared);
+
        return clear_err.cleared;
 }
 EXPORT_SYMBOL_GPL(nvdimm_clear_poison);