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>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 544805a2421b6be655cecbcd5889e8081a60280b..11874afb2422cf12890b383f0e974cce4f99e0c8 100644 (file)
--- 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);
                }