Merge tag 's390-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / drivers / s390 / scsi / zfcp_fsf.c

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 900bb9b..c1f9792 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -2377,7 +2377,7 @@ static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi)
                }
        }
 
-       blk_add_driver_data(scsi->request, &blktrc, sizeof(blktrc));
+       blk_add_driver_data(scsi_cmd_to_rq(scsi), &blktrc, sizeof(blktrc));
 }
 
 /**
@@ -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))