diff options
| author | Keith Busch <keith.busch@intel.com> | 2017-08-29 17:46:02 -0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-08-30 14:59:33 +0200 |
| commit | b5d8af5b521bdb4167808979df37e9defabeb707 (patch) | |
| tree | b8f233d167bcf5262d2c7a4fdad5a6fca51c0167 /drivers/nvme | |
| parent | 1cad65620fecfb24cdeefa5533628a4f293783e7 (diff) | |
| download | linux-stable-b5d8af5b521bdb4167808979df37e9defabeb707.tar.gz linux-stable-b5d8af5b521bdb4167808979df37e9defabeb707.tar.bz2 linux-stable-b5d8af5b521bdb4167808979df37e9defabeb707.zip | |
nvme/pci: Use req_op to determine DIF remapping
Only read and write commands need DIF remapping. Everything else uses
a passthrough integrity payload.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 544805a2421b..11874afb2422 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -668,7 +668,7 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req, if (blk_rq_map_integrity_sg(q, req->bio, &iod->meta_sg) != 1) goto out_unmap; - if (rq_data_dir(req)) + if (req_op(req) == REQ_OP_WRITE) nvme_dif_remap(req, nvme_dif_prep); if (!dma_map_sg(dev->dev, &iod->meta_sg, 1, dma_dir)) @@ -696,7 +696,7 @@ static void nvme_unmap_data(struct nvme_dev *dev, struct request *req) if (iod->nents) { dma_unmap_sg(dev->dev, iod->sg, iod->nents, dma_dir); if (blk_integrity_rq(req)) { - if (!rq_data_dir(req)) + if (req_op(req) == REQ_OP_READ) nvme_dif_remap(req, nvme_dif_complete); dma_unmap_sg(dev->dev, &iod->meta_sg, 1, dma_dir); } |