diff options
| author | Steffen Maier <maier@linux.ibm.com> | 2018-11-08 15:44:43 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-11-15 15:01:17 -0500 |
| commit | 21cb0bcc739a3e744d4ce54dac625b68e6cb2cc4 (patch) | |
| tree | 57d159f8886413e20d7bc6049fee9d99ac706fc9 /drivers/s390 | |
| parent | eb67f93ffa7c3c8c9fbaa9b40d036539cba9879c (diff) | |
scsi: zfcp: group sort internal structure definitions for proximity
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 <maier@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 58 |
1 files 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 |