diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 14:37:39 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-14 13:29:01 -0700 |
| commit | e88da7998d7dc7b40dbe3ac85d9a5d6f91cc2d13 (patch) | |
| tree | 8cf7cfae2d9b42b4739d6bfdf6fe84967fc9aff0 /drivers/nvdimm/claim.c | |
| parent | b3b454f694db663773bc22002e10909afe9c1739 (diff) | |
| download | linux-e88da7998d7dc7b40dbe3ac85d9a5d6f91cc2d13.tar.gz linux-e88da7998d7dc7b40dbe3ac85d9a5d6f91cc2d13.tar.bz2 linux-e88da7998d7dc7b40dbe3ac85d9a5d6f91cc2d13.zip | |
Revert "libnvdimm: band aid btt vs clear poison locking"
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.
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm/claim.c')
| -rw-r--r-- | drivers/nvdimm/claim.c | 10 |
1 files changed, 1 insertions, 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); |