[PATCH 08/23] zfcp: group sort internal structure definitions for proximity

[Steffen Maier]

Have structures just before the structures that use them
(without disrupting sequences of using structures such as
 zfcp_unit and zfcp_scsi_dev):
- zfcp_adapter_mempool embedded in zfcp_adapter,
- zfcp_latenc... embedded in zfcp_scsi_dev.

Signed-off-by: Steffen Maier <ma...@linux.ibm.com>
Reviewed-by: Benjamin Block <bbl...@linux.ibm.com>
---
 drivers/s390/scsi/zfcp_def.h | 58 ++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index e227b0770221..31b3e2bb3b42 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -91,18 +91,6 @@
 
 struct zfcp_fsf_req;
 
-/* holds various memory pools of an adapter */
-struct zfcp_adapter_mempool {
-       mempool_t *erp_req;
-       mempool_t *gid_pn_req;
-       mempool_t *scsi_req;
-       mempool_t *scsi_abort;
-       mempool_t *status_read_req;
-       mempool_t *sr_data;
-       mempool_t *gid_pn;
-       mempool_t *qtcb_pool;
-};
-
 struct zfcp_erp_action {
        struct list_head list;
        int action;                   /* requested action code */
@@ -115,23 +103,16 @@ struct zfcp_erp_action {
        struct timer_list timer;
 };
 
-struct zfcp_latency_record {
-       u32 min;
-       u32 max;
-       u64 sum;
-};
-
-struct zfcp_latency_cont {
-       struct zfcp_latency_record channel;
-       struct zfcp_latency_record fabric;
-       u64 counter;
-};
-
-struct zfcp_latencies {
-       struct zfcp_latency_cont read;
-       struct zfcp_latency_cont write;
-       struct zfcp_latency_cont cmd;
-       spinlock_t lock;
+/* holds various memory pools of an adapter */
+struct zfcp_adapter_mempool {
+       mempool_t *erp_req;
+       mempool_t *gid_pn_req;
+       mempool_t *scsi_req;
+       mempool_t *scsi_abort;
+       mempool_t *status_read_req;
+       mempool_t *sr_data;
+       mempool_t *gid_pn;
+       mempool_t *qtcb_pool;
 };
 
 struct zfcp_adapter {
@@ -212,6 +193,25 @@ struct zfcp_port {
        unsigned int            starget_id;
 };
 
+struct zfcp_latency_record {
+       u32 min;
+       u32 max;
+       u64 sum;
+};
+
+struct zfcp_latency_cont {
+       struct zfcp_latency_record channel;
+       struct zfcp_latency_record fabric;
+       u64 counter;
+};
+
+struct zfcp_latencies {
+       struct zfcp_latency_cont read;
+       struct zfcp_latency_cont write;
+       struct zfcp_latency_cont cmd;
+       spinlock_t lock;
+};
+
 /**
  * struct zfcp_unit - LUN configured via zfcp sysfs
  * @dev: struct device for sysfs representation and reference counting
-- 
2.16.4