nvme-pci: remove duplicate check
authorChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Wed, 17 Oct 2018 18:34:15 +0000 (11:34 -0700)
committerChristoph Hellwig <hch@lst.de>
Thu, 18 Oct 2018 07:31:43 +0000 (09:31 +0200)
This is a cleanup patch doesn't change any functionality. It removes
the duplicate call to the blk_integrity_rq() in the nvme_map_data().

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/pci.c

index 72737009b82d53877463e3e0c71065e10b7616a4..4e023cd007e12d7668fa2978efd6d43d274969d7 100644 (file)
@@ -772,10 +772,10 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
 
                if (!dma_map_sg(dev->dev, &iod->meta_sg, 1, dma_dir))
                        goto out_unmap;
-       }
 
-       if (blk_integrity_rq(req))
                cmnd->rw.metadata = cpu_to_le64(sg_dma_address(&iod->meta_sg));
+       }
+
        return BLK_STS_OK;
 
 out_unmap: