[PATCH 1/5] Revert "libnvdimm: band aid btt vs clear poison locking"

From	Dan Williams <dan.j.williams@intel.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/5] Revert "libnvdimm: band aid btt vs clear poison locking"
Date	2017-04-14 19:10 +0200
Message-ID	<twcTn-3LV-7@gated-at.bofh.it> (permalink)
References	<twcTn-3LV-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

This reverts commit 4aa5615e080a "libnvdimm: band aid btt vs clear
poison locking".

Now that poison list locking has been converted to a spinlock and poison
list entry allocation during i/o has been converted to GFP_NOWAIT,
revert the band-aid that disabled error clearing from btt i/o.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 drivers/nvdimm/claim.c |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c
index ca6d572c48fc..b3323c0697f6 100644
--- a/drivers/nvdimm/claim.c
+++ b/drivers/nvdimm/claim.c
@@ -243,15 +243,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,
 	}
 
 	if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) {
-		/*
-		 * FIXME: nsio_rw_bytes() may be called from atomic
-		 * context in the btt case and nvdimm_clear_poison()
-		 * takes a sleeping lock. Until the locking can be
-		 * reworked this capability requires that the namespace
-		 * is not claimed by btt.
-		 */
-		if (IS_ALIGNED(offset, 512) && IS_ALIGNED(size, 512)
-				&& (!ndns->claim || !is_nd_btt(ndns->claim))) {
+		if (IS_ALIGNED(offset, 512) && IS_ALIGNED(size, 512)) {
 			long cleared;
 
 			cleared = nvdimm_clear_poison(&ndns->dev, offset, size);

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 1/5] Revert "libnvdimm: band aid btt vs clear poison locking" Dan Williams <dan.j.williams@intel.com> - 2017-04-14 19:10 +0200

csiph-web