diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-20 11:50:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-20 11:50:49 -0400 |
commit | 9600c11ba3602be161cd376f1460f3de561fc299 (patch) | |
tree | d071c2427a8f7ad601aec6d8ae76b0f61410becf /drivers/s390/scsi/zfcp_ext.h | |
parent | 676d55ae30ea3b688f0386f70553489f25f24d55 (diff) | |
parent | 13e1e1f08c1c098c7574c1fa72bd8c67792dc89b (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/s390/scsi/zfcp_ext.h')
-rw-r--r-- | drivers/s390/scsi/zfcp_ext.h | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index cd98a2de9f8f..c3782261cb5c 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h | |||
@@ -96,7 +96,8 @@ extern int zfcp_fsf_open_unit(struct zfcp_erp_action *); | |||
96 | extern int zfcp_fsf_close_unit(struct zfcp_erp_action *); | 96 | extern int zfcp_fsf_close_unit(struct zfcp_erp_action *); |
97 | 97 | ||
98 | extern int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *); | 98 | extern int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *); |
99 | extern int zfcp_fsf_exchange_port_data(struct zfcp_adapter *, | 99 | extern int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *, |
100 | struct zfcp_adapter *, | ||
100 | struct fsf_qtcb_bottom_port *); | 101 | struct fsf_qtcb_bottom_port *); |
101 | extern int zfcp_fsf_control_file(struct zfcp_adapter *, struct zfcp_fsf_req **, | 102 | extern int zfcp_fsf_control_file(struct zfcp_adapter *, struct zfcp_fsf_req **, |
102 | u32, u32, struct zfcp_sg_list *); | 103 | u32, u32, struct zfcp_sg_list *); |
@@ -109,7 +110,6 @@ extern int zfcp_fsf_req_create(struct zfcp_adapter *, u32, int, mempool_t *, | |||
109 | extern int zfcp_fsf_send_ct(struct zfcp_send_ct *, mempool_t *, | 110 | extern int zfcp_fsf_send_ct(struct zfcp_send_ct *, mempool_t *, |
110 | struct zfcp_erp_action *); | 111 | struct zfcp_erp_action *); |
111 | extern int zfcp_fsf_send_els(struct zfcp_send_els *); | 112 | extern int zfcp_fsf_send_els(struct zfcp_send_els *); |
112 | extern int zfcp_fsf_req_wait_and_cleanup(struct zfcp_fsf_req *, int, u32 *); | ||
113 | extern int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *, | 113 | extern int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *, |
114 | struct zfcp_unit *, | 114 | struct zfcp_unit *, |
115 | struct scsi_cmnd *, | 115 | struct scsi_cmnd *, |
@@ -182,9 +182,25 @@ extern void zfcp_erp_port_access_changed(struct zfcp_port *); | |||
182 | extern void zfcp_erp_unit_access_changed(struct zfcp_unit *); | 182 | extern void zfcp_erp_unit_access_changed(struct zfcp_unit *); |
183 | 183 | ||
184 | /******************************** AUX ****************************************/ | 184 | /******************************** AUX ****************************************/ |
185 | extern void zfcp_cmd_dbf_event_fsf(const char *, struct zfcp_fsf_req *, | 185 | extern void zfcp_hba_dbf_event_fsf_response(struct zfcp_fsf_req *); |
186 | void *, int); | 186 | extern void zfcp_hba_dbf_event_fsf_unsol(const char *, struct zfcp_adapter *, |
187 | extern void zfcp_cmd_dbf_event_scsi(const char *, struct scsi_cmnd *); | 187 | struct fsf_status_read_buffer *); |
188 | extern void zfcp_in_els_dbf_event(struct zfcp_adapter *, const char *, | 188 | extern void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *, |
189 | struct fsf_status_read_buffer *, int); | 189 | unsigned int, unsigned int, unsigned int, |
190 | int, int); | ||
191 | |||
192 | extern void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *); | ||
193 | extern void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *); | ||
194 | extern void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *); | ||
195 | extern void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *); | ||
196 | extern void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *); | ||
197 | |||
198 | extern void zfcp_scsi_dbf_event_result(const char *, int, struct zfcp_adapter *, | ||
199 | struct scsi_cmnd *); | ||
200 | extern void zfcp_scsi_dbf_event_abort(const char *, struct zfcp_adapter *, | ||
201 | struct scsi_cmnd *, | ||
202 | struct zfcp_fsf_req *); | ||
203 | extern void zfcp_scsi_dbf_event_devreset(const char *, u8, struct zfcp_unit *, | ||
204 | struct scsi_cmnd *); | ||
205 | |||
190 | #endif /* ZFCP_EXT_H */ | 206 | #endif /* ZFCP_EXT_H */ |