Commit 52ef11a7 authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley

[SCSI] zfcp: cleanup, separation of ERP, non ERP-version for exchange_ functions

cleanup, using ERP request mempool for all ERP versions of
the exchange functions (exchange_config (ECD), exchange_port (EPD) )
providing individual versions of the ECD, EPD functions for ERP
and other purposes (_sync).
Signed-off-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 03f002f7
...@@ -2197,7 +2197,7 @@ zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action) ...@@ -2197,7 +2197,7 @@ zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action)
zfcp_erp_action_to_running(erp_action); zfcp_erp_action_to_running(erp_action);
write_unlock_irq(&adapter->erp_lock); write_unlock_irq(&adapter->erp_lock);
ret = zfcp_fsf_exchange_port_data(erp_action, adapter, NULL); ret = zfcp_fsf_exchange_port_data(erp_action);
if (ret == -EOPNOTSUPP) { if (ret == -EOPNOTSUPP) {
debug_text_event(adapter->erp_dbf, 3, "a_xport_notsupp"); debug_text_event(adapter->erp_dbf, 3, "a_xport_notsupp");
return ZFCP_ERP_SUCCEEDED; return ZFCP_ERP_SUCCEEDED;
......
...@@ -82,9 +82,11 @@ extern int zfcp_fsf_open_unit(struct zfcp_erp_action *); ...@@ -82,9 +82,11 @@ extern int zfcp_fsf_open_unit(struct zfcp_erp_action *);
extern int zfcp_fsf_close_unit(struct zfcp_erp_action *); extern int zfcp_fsf_close_unit(struct zfcp_erp_action *);
extern int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *); extern int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *);
extern int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *, extern int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *,
struct zfcp_adapter *, struct fsf_qtcb_bottom_config *);
struct fsf_qtcb_bottom_port *); extern int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *);
extern int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *,
struct fsf_qtcb_bottom_port *);
extern int zfcp_fsf_control_file(struct zfcp_adapter *, struct zfcp_fsf_req **, extern int zfcp_fsf_control_file(struct zfcp_adapter *, struct zfcp_fsf_req **,
u32, u32, struct zfcp_sg_list *); u32, u32, struct zfcp_sg_list *);
extern void zfcp_fsf_start_timer(struct zfcp_fsf_req *, unsigned long); extern void zfcp_fsf_start_timer(struct zfcp_fsf_req *, unsigned long);
......
This diff is collapsed.
...@@ -731,7 +731,7 @@ zfcp_get_fc_host_stats(struct Scsi_Host *shost) ...@@ -731,7 +731,7 @@ zfcp_get_fc_host_stats(struct Scsi_Host *shost)
if (!data) if (!data)
return NULL; return NULL;
ret = zfcp_fsf_exchange_port_data(NULL, adapter, data); ret = zfcp_fsf_exchange_port_data_sync(adapter, data);
if (ret) { if (ret) {
kfree(data); kfree(data);
return NULL; /* XXX return zeroed fc_stats? */ return NULL; /* XXX return zeroed fc_stats? */
...@@ -761,7 +761,7 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost) ...@@ -761,7 +761,7 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost)
if (!data) if (!data)
return; return;
ret = zfcp_fsf_exchange_port_data(NULL, adapter, data); ret = zfcp_fsf_exchange_port_data_sync(adapter, data);
if (ret) { if (ret) {
kfree(data); kfree(data);
} else { } else {
...@@ -800,6 +800,7 @@ struct fc_function_template zfcp_transport_functions = { ...@@ -800,6 +800,7 @@ struct fc_function_template zfcp_transport_functions = {
.show_host_port_type = 1, .show_host_port_type = 1,
.show_host_speed = 1, .show_host_speed = 1,
.show_host_port_id = 1, .show_host_port_id = 1,
.disable_target_scan = 1,
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment