Browse Source

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>
Vishal Verma 8 years ago
parent
commit
7e5a21dfe5
1 changed files with 1 additions and 2 deletions
  1. 1 2
      drivers/nvdimm/claim.c

+ 1 - 2
drivers/nvdimm/claim.c

@@ -289,8 +289,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,
 		 * work around this collision.
 		 * work around this collision.
 		 */
 		 */
 		if (IS_ALIGNED(offset, 512) && IS_ALIGNED(size, 512)
 		if (IS_ALIGNED(offset, 512) && IS_ALIGNED(size, 512)
-				&& !(flags & NVDIMM_IO_ATOMIC)
-				&& !ndns->claim) {
+				&& !(flags & NVDIMM_IO_ATOMIC)) {
 			long cleared;
 			long cleared;
 
 
 			cleared = nvdimm_clear_poison(&ndns->dev,
 			cleared = nvdimm_clear_poison(&ndns->dev,