Skip to content

Commit

Permalink
libnvdimm: fix clear length of nvdimm_forget_poison()
Browse files Browse the repository at this point in the history
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.

Cc: <stable@vger.kernel.org>
Fixes: e046114 ("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>
  • Loading branch information
toshikani authored and djbw committed Apr 28, 2017
1 parent b2518c7 commit 8d13c02
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/nvdimm/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,9 @@ long nvdimm_clear_poison(struct device *dev, phys_addr_t phys,
if (cmd_rc < 0)
return cmd_rc;

nvdimm_forget_poison(nvdimm_bus, phys, len);
if (clear_err.cleared > 0)
nvdimm_forget_poison(nvdimm_bus, phys, clear_err.cleared);

return clear_err.cleared;
}
EXPORT_SYMBOL_GPL(nvdimm_clear_poison);
Expand Down

0 comments on commit 8d13c02

Please sign in to comment.