Merge tag 'gfs2-4.20.fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...

[linux.git] / drivers / scsi / virtio_scsi.c

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 6dc8891ccb745a8b1bb259de3fd03e46715d9325..1c72db94270e89990b59e9c2a410110580c50827 100644 (file)
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -513,12 +513,12 @@ static void virtio_scsi_init_hdr_pi(struct virtio_device *vdev,
 
        if (sc->sc_data_direction == DMA_TO_DEVICE)
                cmd_pi->pi_bytesout = cpu_to_virtio32(vdev,
-                                                       blk_rq_sectors(rq) *
-                                                       bi->tuple_size);
+                                                     bio_integrity_bytes(bi,
+                                                       blk_rq_sectors(rq)));
        else if (sc->sc_data_direction == DMA_FROM_DEVICE)
                cmd_pi->pi_bytesin = cpu_to_virtio32(vdev,
-                                                      blk_rq_sectors(rq) *
-                                                      bi->tuple_size);
+                                                    bio_integrity_bytes(bi,
+                                                       blk_rq_sectors(rq)));
 }
 #endif