libnvdimm: fix the clear-error check in nsio_rw_bytes
authorVishal Verma <vishal.l.verma@intel.com>
Sat, 1 Jul 2017 00:32:52 +0000 (18:32 -0600)
committerDan Williams <dan.j.williams@intel.com>
Sat, 1 Jul 2017 01:50:34 +0000 (18:50 -0700)
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>
drivers/nvdimm/claim.c

index 8d23f68737d9723d6edf51c1a8038496de36f739..f8ad92b4dcd2e0212f43e633558f8a208145ae5b 100644 (file)
@@ -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,