Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e5a21df authored by Vishal Verma's avatar Vishal Verma Committed by Dan Williams
Browse files

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: 3ae3d67b ("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: default avatarVishal Verma <vishal.l.verma@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent c13c43d5

drivers/nvdimm/claim.c

+1 −2
Original line number Diff line number Diff line
@@ -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,