diff options
author | Andreas Herrmann <aherrman@de.ibm.com> | 2006-09-18 16:29:56 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-09-23 19:01:23 -0400 |
commit | 2abbe866c8eb0296e3f5343bcf73e5371522a738 (patch) | |
tree | c839b12b43d07d538e32bcabec1fefa2106f384f /drivers/s390/scsi/zfcp_ext.h | |
parent | 4eff4a36516d72e4f6ede901141214a7e05607e7 (diff) |
[SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
This instance will be used whenever a timer is needed for
a request by zfcp.
Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_ext.h')
-rw-r--r-- | drivers/s390/scsi/zfcp_ext.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index 710ebbf89929..3125a42a6343 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h | |||
@@ -87,8 +87,8 @@ extern int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *, | |||
87 | struct fsf_qtcb_bottom_port *); | 87 | struct fsf_qtcb_bottom_port *); |
88 | extern int zfcp_fsf_control_file(struct zfcp_adapter *, struct zfcp_fsf_req **, | 88 | extern int zfcp_fsf_control_file(struct zfcp_adapter *, struct zfcp_fsf_req **, |
89 | u32, u32, struct zfcp_sg_list *); | 89 | u32, u32, struct zfcp_sg_list *); |
90 | extern void zfcp_fsf_request_timeout_handler(unsigned long); | 90 | extern void zfcp_fsf_start_timer(struct zfcp_fsf_req *, unsigned long); |
91 | extern void zfcp_fsf_scsi_er_timeout_handler(unsigned long); | 91 | extern void zfcp_erp_start_timer(struct zfcp_fsf_req *); |
92 | extern int zfcp_fsf_req_dismiss_all(struct zfcp_adapter *); | 92 | extern int zfcp_fsf_req_dismiss_all(struct zfcp_adapter *); |
93 | extern int zfcp_fsf_status_read(struct zfcp_adapter *, int); | 93 | extern int zfcp_fsf_status_read(struct zfcp_adapter *, int); |
94 | extern int zfcp_fsf_req_create(struct zfcp_adapter *, u32, int, mempool_t *, | 94 | extern int zfcp_fsf_req_create(struct zfcp_adapter *, u32, int, mempool_t *, |
@@ -98,8 +98,7 @@ extern int zfcp_fsf_send_ct(struct zfcp_send_ct *, mempool_t *, | |||
98 | extern int zfcp_fsf_send_els(struct zfcp_send_els *); | 98 | extern int zfcp_fsf_send_els(struct zfcp_send_els *); |
99 | extern int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *, | 99 | extern int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *, |
100 | struct zfcp_unit *, | 100 | struct zfcp_unit *, |
101 | struct scsi_cmnd *, | 101 | struct scsi_cmnd *, int, int); |
102 | struct timer_list*, int); | ||
103 | extern int zfcp_fsf_req_complete(struct zfcp_fsf_req *); | 102 | extern int zfcp_fsf_req_complete(struct zfcp_fsf_req *); |
104 | extern void zfcp_fsf_incoming_els(struct zfcp_fsf_req *); | 103 | extern void zfcp_fsf_incoming_els(struct zfcp_fsf_req *); |
105 | extern void zfcp_fsf_req_free(struct zfcp_fsf_req *); | 104 | extern void zfcp_fsf_req_free(struct zfcp_fsf_req *); |
@@ -123,13 +122,11 @@ extern char *zfcp_get_fcp_rsp_info_ptr(struct fcp_rsp_iu *); | |||
123 | extern void set_host_byte(u32 *, char); | 122 | extern void set_host_byte(u32 *, char); |
124 | extern void set_driver_byte(u32 *, char); | 123 | extern void set_driver_byte(u32 *, char); |
125 | extern char *zfcp_get_fcp_sns_info_ptr(struct fcp_rsp_iu *); | 124 | extern char *zfcp_get_fcp_sns_info_ptr(struct fcp_rsp_iu *); |
126 | extern void zfcp_fsf_start_scsi_er_timer(struct zfcp_adapter *); | ||
127 | extern fcp_dl_t zfcp_get_fcp_dl(struct fcp_cmnd_iu *); | 125 | extern fcp_dl_t zfcp_get_fcp_dl(struct fcp_cmnd_iu *); |
128 | 126 | ||
129 | extern int zfcp_scsi_command_async(struct zfcp_adapter *,struct zfcp_unit *, | 127 | extern int zfcp_scsi_command_async(struct zfcp_adapter *,struct zfcp_unit *, |
130 | struct scsi_cmnd *, struct timer_list *); | 128 | struct scsi_cmnd *, int); |
131 | extern int zfcp_scsi_command_sync(struct zfcp_unit *, struct scsi_cmnd *, | 129 | extern int zfcp_scsi_command_sync(struct zfcp_unit *, struct scsi_cmnd *, int); |
132 | struct timer_list *); | ||
133 | extern struct fc_function_template zfcp_transport_functions; | 130 | extern struct fc_function_template zfcp_transport_functions; |
134 | 131 | ||
135 | /******************************** ERP ****************************************/ | 132 | /******************************** ERP ****************************************/ |