[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: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 3a7f3b87fb36..5fbbd21a88e4 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -731,7 +731,7 @@ zfcp_get_fc_host_stats(struct Scsi_Host *shost)
         if (!data)
                 return NULL;
 
-        ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);
+        ret = zfcp_fsf_exchange_port_data_sync(adapter, data);
         if (ret) {
                 kfree(data);
                 return NULL; /* XXX return zeroed fc_stats? */
@@ -761,7 +761,7 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost)
         if (!data)
                 return;
 
-        ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);
+        ret = zfcp_fsf_exchange_port_data_sync(adapter, data);
         if (ret) {
                 kfree(data);
         } else {
@@ -800,6 +800,7 @@ struct fc_function_template zfcp_transport_functions = {
         .show_host_port_type = 1,
         .show_host_speed = 1,
         .show_host_port_id = 1,
+        .disable_target_scan = 1,
 };
 
 /**