scsi: zfcp: Use the proper SCSI midlayer interfaces for PI

Use scsi_prot_ref_tag() and scsi_prot_interval() instead scsi_get_lba() and
sector_size.

Link: https://lore.kernel.org/r/20210609033929.3815-7-martin.petersen@oracle.com
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Message-Id: <20210609033929.3815-7-martin.petersen@oracle.com>

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 2e4804ef2fb96fd1ae5012d1332b49db2e0d9ff2..1990216cf28977d393c8d402f5fc393b071f6b7d 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -2599,8 +2599,8 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd)
        io->fcp_cmnd_length = FCP_CMND_LEN;
 
        if (scsi_get_prot_op(scsi_cmnd) != SCSI_PROT_NORMAL) {
-               io->data_block_length = scsi_cmnd->device->sector_size;
-               io->ref_tag_value = scsi_get_lba(scsi_cmnd) & 0xFFFFFFFF;
+               io->data_block_length = scsi_prot_interval(scsi_cmnd);
+               io->ref_tag_value = scsi_prot_ref_tag(scsi_cmnd);
        }
 
        if (zfcp_fsf_set_data_dir(scsi_cmnd, &io->data_direction))