scsi: use request to get integrity segments

keithbusch · axboe · commit 27c3785e94f0 · 2024-09-13T12:31:45.000-06:00
The request tracks the integrity segments already, so no need to recount the segments again. Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Kanchan Joshi <joshi.k@samsung.com> Signed-off-by: Keith Busch <kbusch@kernel.org> Link: https://lore.kernel.org/r/20240913182854.2445457-7-kbusch@meta.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
@@ -1175,8 +1175,7 @@ blk_status_t scsi_alloc_sgtables(struct scsi_cmnd *cmd)
 			goto out_free_sgtables;
 		}
 
-		ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);
-
+		ivecs = rq->nr_integrity_segments;
 		if (sg_alloc_table_chained(&prot_sdb->table, ivecs,
 				prot_sdb->table.sgl,
 				SCSI_INLINE_PROT_SG_CNT)) {

Original file line number	Diff line number	Diff line change
`@@ -1175,8 +1175,7 @@ blk_status_t scsi_alloc_sgtables(struct scsi_cmnd *cmd)`
`1175`	`1175`	`goto out_free_sgtables;`
`1176`	`1176`	`}`
`1177`	`1177`
`1178`		`- ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);`
`1179`		`-`
	`1178`	`+ ivecs = rq->nr_integrity_segments;`
`1180`	`1179`	`if (sg_alloc_table_chained(&prot_sdb->table, ivecs,`
`1181`	`1180`	`prot_sdb->table.sgl,`
`1182`	`1181`	`SCSI_INLINE_PROT_SG_CNT)) {`