> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c > index 3958a6d14bf45..dc1a1644cbc0c 100644 > --- 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 = blk_rq_integrity_segments(rq); Looks good: Reviewed-by: Christoph Hellwig <hch@xxxxxx> although I'd be tempted to just remove the BUG_ON below (or move it into blk_rq_map_integrity_sg) and the ivecs variable entirely.
