Commit bf508e91 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

nvme: add missing unmaps in nvme_queue_rq

When we fail various metadata related operations in nvme_queue_rq we
need to unmap the data SGL.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent c5c9f25b
...@@ -896,19 +896,28 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx, ...@@ -896,19 +896,28 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
goto retry_cmd; goto retry_cmd;
} }
if (blk_integrity_rq(req)) { if (blk_integrity_rq(req)) {
if (blk_rq_count_integrity_sg(req->q, req->bio) != 1) if (blk_rq_count_integrity_sg(req->q, req->bio) != 1) {
dma_unmap_sg(dev->dev, iod->sg, iod->nents,
dma_dir);
goto error_cmd; goto error_cmd;
}
sg_init_table(iod->meta_sg, 1); sg_init_table(iod->meta_sg, 1);
if (blk_rq_map_integrity_sg( if (blk_rq_map_integrity_sg(
req->q, req->bio, iod->meta_sg) != 1) req->q, req->bio, iod->meta_sg) != 1) {
dma_unmap_sg(dev->dev, iod->sg, iod->nents,
dma_dir);
goto error_cmd; goto error_cmd;
}
if (rq_data_dir(req)) if (rq_data_dir(req))
nvme_dif_remap(req, nvme_dif_prep); nvme_dif_remap(req, nvme_dif_prep);
if (!dma_map_sg(nvmeq->q_dmadev, iod->meta_sg, 1, dma_dir)) if (!dma_map_sg(nvmeq->q_dmadev, iod->meta_sg, 1, dma_dir)) {
dma_unmap_sg(dev->dev, iod->sg, iod->nents,
dma_dir);
goto error_cmd; goto error_cmd;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment