[SCSI] zfcp: Move qdio related data out of zfcp_adapter

The zfcp_adapter structure was growing over time to a size of almost
one memory page. To reduce the size of the data structure and to
seperate different layers, put all qdio related data in the new
zfcp_qdio data structure.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 0fe5cce818cb..a6cf62636834 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -425,7 +425,7 @@ static ssize_t zfcp_sysfs_adapter_util_show(struct device *dev,
         if (!qtcb_port)
                 return -ENOMEM;
 
-        retval = zfcp_fsf_exchange_port_data_sync(adapter, qtcb_port);
+        retval = zfcp_fsf_exchange_port_data_sync(adapter->qdio, qtcb_port);
         if (!retval)
                 retval = sprintf(buf, "%u %u %u\n", qtcb_port->cp_util,
                                  qtcb_port->cb_util, qtcb_port->a_util);
@@ -451,7 +451,7 @@ static int zfcp_sysfs_adapter_ex_config(struct device *dev,
         if (!qtcb_config)
                 return -ENOMEM;
 
-        retval = zfcp_fsf_exchange_config_data_sync(adapter, qtcb_config);
+        retval = zfcp_fsf_exchange_config_data_sync(adapter->qdio, qtcb_config);
         if (!retval)
                 *stat_inf = qtcb_config->stat_info;
 
@@ -492,15 +492,15 @@ static ssize_t zfcp_sysfs_adapter_q_full_show(struct device *dev,
                                               char *buf)
 {
         struct Scsi_Host *scsi_host = class_to_shost(dev);
-        struct zfcp_adapter *adapter =
-                (struct zfcp_adapter *) scsi_host->hostdata[0];
+        struct zfcp_qdio *qdio =
+                ((struct zfcp_adapter *) scsi_host->hostdata[0])->qdio;
         u64 util;
 
-        spin_lock_bh(&adapter->qdio_stat_lock);
-        util = adapter->req_q_util;
-        spin_unlock_bh(&adapter->qdio_stat_lock);
+        spin_lock_bh(&qdio->stat_lock);
+        util = qdio->req_q_util;
+        spin_unlock_bh(&qdio->stat_lock);
 
-        return sprintf(buf, "%d %llu\n", atomic_read(&adapter->qdio_outb_full),
+        return sprintf(buf, "%d %llu\n", atomic_read(&qdio->req_q_full),
                        (unsigned long long)util);
 }
 static DEVICE_ATTR(queue_full, S_IRUGO, zfcp_sysfs_adapter_q_full_show, NULL);