diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-25 18:20:11 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-25 18:20:11 +1000 |
| commit | 4856a1a36f308b09200cb7dc813539f4318627c3 (patch) | |
| tree | 9c910d6c6776f9280a17a13167a670329f3b1aee /drivers/s390/scsi/zfcp_ext.h | |
| parent | 52f31e122cd1a9d9cdebecbf327edf510d5f1fa0 (diff) | |
| parent | add2b5e0d596c4ce1aa10f845d9ba49eb5e2f605 (diff) | |
Merge commit 'scsi-post-merge/master'
Conflicts:
include/Kbuild
Diffstat (limited to 'drivers/s390/scsi/zfcp_ext.h')
| -rw-r--r-- | drivers/s390/scsi/zfcp_ext.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index 120a9a1c81f7..3044c6010306 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h @@ -106,8 +106,12 @@ extern int zfcp_fc_ns_gid_pn(struct zfcp_erp_action *); extern void zfcp_fc_plogi_evaluate(struct zfcp_port *, struct fsf_plogi *); extern void zfcp_test_link(struct zfcp_port *); extern void zfcp_fc_link_test_work(struct work_struct *); -extern void zfcp_fc_nameserver_init(struct zfcp_adapter *); extern void zfcp_fc_wka_port_force_offline(struct zfcp_wka_port *); +extern void zfcp_fc_wka_ports_init(struct zfcp_adapter *); +extern int zfcp_fc_execute_els_fc_job(struct fc_bsg_job *); +extern int zfcp_fc_execute_ct_fc_job(struct fc_bsg_job *); +extern void zfcp_fc_wka_port_force_offline(struct zfcp_wka_port *); + /* zfcp_fsf.c */ extern int zfcp_fsf_open_port(struct zfcp_erp_action *); |