libnvdimm: fix mishandled nvdimm_clear_poison() return value

[karo-tx-linux.git] / drivers / nvdimm / claim.c

diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c
index 97d1772774a806d4514bea512f4d4fdd10cce33c..b3323c0697f6239ebbfe757137cde8352fe3c480 100644 (file)
--- a/drivers/nvdimm/claim.c
+++ b/drivers/nvdimm/claim.c
@@ -247,12 +247,13 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,
                        long cleared;
 
                        cleared = nvdimm_clear_poison(&ndns->dev, offset, size);
-                       if (cleared != size) {
-                               size = cleared;
+                       if (cleared < size)
                                rc = -EIO;
+                       if (cleared > 0 && cleared / 512) {
+                               cleared /= 512;
+                               badblocks_clear(&nsio->bb, sector, cleared);
                        }
-
-                       badblocks_clear(&nsio->bb, sector, cleared >> 9);
+                       invalidate_pmem(nsio->addr + offset, size);
                } else
                        rc = -EIO;
        }