summaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi/zfcp_ext.h
diff options
context:
space:
mode:
authorSwen Schillig2010-01-14 17:19:02 +0100
committerJames Bottomley2010-01-17 19:40:13 +0100
commit51375ee8374dd7fa574e1a14ebac406c6d28543b (patch)
treecfc822b99af2a8bb894c4a549093f92ea917ff8e /drivers/s390/scsi/zfcp_ext.h
parent[SCSI] zfcp: Introduce bsg_timeout callback. (diff)
downloadkernel-qcow2-linux-51375ee8374dd7fa574e1a14ebac406c6d28543b.tar.gz
kernel-qcow2-linux-51375ee8374dd7fa574e1a14ebac406c6d28543b.tar.xz
kernel-qcow2-linux-51375ee8374dd7fa574e1a14ebac406c6d28543b.zip
[SCSI] zfcp: Set hardware timeout as requested by BSG request.
The hardware used with zfcp provides a timer for CT and ELS requests instead of an abort capability for these commands. To correctly handle the FC BSG timeouts, pass the timeout from the BSG requests to the hardware. Signed-off-by: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/s390/scsi/zfcp_ext.h')
-rw-r--r--drivers/s390/scsi/zfcp_ext.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index 1406a65a6205..66bdb34143cb 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -130,9 +130,9 @@ extern void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *);
extern int zfcp_fsf_status_read(struct zfcp_qdio *);
extern int zfcp_status_read_refill(struct zfcp_adapter *adapter);
extern int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *, struct zfcp_fsf_ct_els *,
- mempool_t *);
+ mempool_t *, unsigned int);
extern int zfcp_fsf_send_els(struct zfcp_adapter *, u32,
- struct zfcp_fsf_ct_els *);
+ struct zfcp_fsf_ct_els *, unsigned int);
extern int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *,
struct scsi_cmnd *);
extern void zfcp_fsf_req_free(struct zfcp_fsf_req *);