projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
2e4804e
..
c1f9792
100644
(file)
--- a/
drivers/s390/scsi/zfcp_fsf.c
+++ b/
drivers/s390/scsi/zfcp_fsf.c
@@
-2275,7
+2275,7
@@
static void zfcp_fsf_close_lun_handler(struct zfcp_fsf_req *req)
}
/**
}
/**
- * zfcp_fsf_close_
LUN
- close LUN
+ * zfcp_fsf_close_
lun
- close LUN
* @erp_action: pointer to erp_action triggering the "close LUN"
* Returns: 0 on success, error otherwise
*/
* @erp_action: pointer to erp_action triggering the "close LUN"
* Returns: 0 on success, error otherwise
*/
@@
-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->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))
}
if (zfcp_fsf_set_data_dir(scsi_cmnd, &io->data_direction))