From: Vishal Verma <vishal.l.verma@intel.com>
Date: Sat, 1 Jul 2017 00:32:52 +0000 (-0600)
Subject: libnvdimm: fix the clear-error check in nsio_rw_bytes
X-Git-Tag: v4.13-rc1~120^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e5a21dfe5524a85705d3bc7b540c849cc13e9a1;p=karo-tx-linux.git

libnvdimm: fix the clear-error check in nsio_rw_bytes

A leftover from the 'bandaid' fix that disabled BTT error clearing in
rw_bytes resulted in an incorrect check. After we converted these checks
over to use the NVDIMM_IO_ATOMIC flag, the ndns->claim check was both
redundant, and incorrect. Remove it.

Fixes: 3ae3d67ba705 ("libnvdimm: add an atomic vs process context flag to rw_bytes")
Cc: <stable@vger.kernel.org>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c
index 8d23f68737d9..f8ad92b4dcd2 100644
--- a/drivers/nvdimm/claim.c
+++ b/drivers/nvdimm/claim.c
@@ -289,8 +289,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,
 		 * work around this collision.
 		 */
 		if (IS_ALIGNED(offset, 512) && IS_ALIGNED(size, 512)
-				&& !(flags & NVDIMM_IO_ATOMIC)
-				&& !ndns->claim) {
+				&& !(flags & NVDIMM_IO_ATOMIC)) {
 			long cleared;
 
 			cleared = nvdimm_clear_poison(&ndns->dev,