* [PATCH] nvme-pci: remove duplicate check
@ 2018-10-17 18:34 Chaitanya Kulkarni
2018-10-17 19:14 ` Keith Busch
2018-10-18 7:31 ` Christoph Hellwig
0 siblings, 2 replies; 3+ messages in thread
From: Chaitanya Kulkarni @ 2018-10-17 18:34 UTC (permalink / raw)
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 at wdc.com>
---
drivers/nvme/host/pci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 72737009b82d..4e023cd007e1 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -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:
--
2.17.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] nvme-pci: remove duplicate check
2018-10-17 18:34 [PATCH] nvme-pci: remove duplicate check Chaitanya Kulkarni
@ 2018-10-17 19:14 ` Keith Busch
2018-10-18 7:31 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Keith Busch @ 2018-10-17 19:14 UTC (permalink / raw)
On Wed, Oct 17, 2018@11:34:15AM -0700, Chaitanya Kulkarni wrote:
> 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 at wdc.com>
Looks good.
Reviewed-by: Keith Busch <keith.busch at intel.com>
> ---
> drivers/nvme/host/pci.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 72737009b82d..4e023cd007e1 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -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:
> --
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] nvme-pci: remove duplicate check
2018-10-17 18:34 [PATCH] nvme-pci: remove duplicate check Chaitanya Kulkarni
2018-10-17 19:14 ` Keith Busch
@ 2018-10-18 7:31 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2018-10-18 7:31 UTC (permalink / raw)
Thanks,
applied to nvme-4.20.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-18 7:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-17 18:34 [PATCH] nvme-pci: remove duplicate check Chaitanya Kulkarni
2018-10-17 19:14 ` Keith Busch
2018-10-18 7:31 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox