diff options
author | Keith Busch <kbusch@kernel.org> | 2024-09-13 12:17:46 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2024-09-13 13:22:09 -0600 |
commit | 76c313f658d2752e8527610677164aa7094ef7a5 (patch) | |
tree | c25189dcc7f657058d8f3ef73eb31f8f8d08c572 /drivers/nvme | |
parent | db5197b554fcb8fde0182af65e8e94bec414e342 (diff) | |
download | linux-stable-76c313f658d2752e8527610677164aa7094ef7a5.tar.gz linux-stable-76c313f658d2752e8527610677164aa7094ef7a5.tar.bz2 linux-stable-76c313f658d2752e8527610677164aa7094ef7a5.zip |
blk-integrity: improved sg segment mapping
Make the integrity mapping more like data mapping, blk_rq_map_sg. Use
the request to validate the segment count, and update the callers so
they don't have to.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20240913191746.2628196-1-kbusch@meta.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme')
-rw-r--r-- | drivers/nvme/host/rdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 256466bdaee7..c8fd0e8f0237 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1504,8 +1504,8 @@ static int nvme_rdma_dma_map_req(struct ib_device *ibdev, struct request *rq, goto out_unmap_sg; } - req->metadata_sgl->nents = blk_rq_map_integrity_sg(rq->q, - rq->bio, req->metadata_sgl->sg_table.sgl); + req->metadata_sgl->nents = blk_rq_map_integrity_sg(rq, + req->metadata_sgl->sg_table.sgl); *pi_count = ib_dma_map_sg(ibdev, req->metadata_sgl->sg_table.sgl, req->metadata_sgl->nents, |