| Message ID | 20190321231037.25104-10-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/15] block: add a req_bvec helper | expand |
On 3/21/19 4:11 PM, Christoph Hellwig wrote: > This mirrors how nvme_map_pci is called and will allow simplifying some > checks in nvme_unmap_pci later on. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/nvme/host/pci.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index ce8bdc15ec3c..bc4ee869fe82 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -929,7 +929,8 @@ static void nvme_pci_complete_rq(struct request *req) > struct nvme_iod *iod = blk_mq_rq_to_pdu(req); > > nvme_cleanup_cmd(req); > - nvme_unmap_data(iod->nvmeq->dev, req); > + if (blk_rq_nr_phys_segments(req)) > + nvme_unmap_data(iod->nvmeq->dev, req); > nvme_complete_rq(req); > } > > Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index ce8bdc15ec3c..bc4ee869fe82 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -929,7 +929,8 @@ static void nvme_pci_complete_rq(struct request *req) struct nvme_iod *iod = blk_mq_rq_to_pdu(req); nvme_cleanup_cmd(req); - nvme_unmap_data(iod->nvmeq->dev, req); + if (blk_rq_nr_phys_segments(req)) + nvme_unmap_data(iod->nvmeq->dev, req); nvme_complete_rq(req); }
This mirrors how nvme_map_pci is called and will allow simplifying some checks in nvme_unmap_pci later on. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)