Commit 6bc473dd authored by Martin Peschke's avatar Martin Peschke Committed by James Bottomley

[SCSI] zfcp: Shorten excessive names in debug trace.

Saving on line breaks, improving readability, by shortening excessive
function names and identifiers, by simplifying some functions call
chains, and by simplifying nesting of some data structure.
Signed-off-by: default avatarMartin Peschke <mp3@de.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 2b604c9b
This diff is collapsed.
...@@ -104,9 +104,9 @@ struct zfcp_hba_dbf_record_response { ...@@ -104,9 +104,9 @@ struct zfcp_hba_dbf_record_response {
u64 erp_action; u64 erp_action;
union { union {
struct { struct {
u64 scsi_cmnd; u64 cmnd;
u64 scsi_serial; u64 serial;
} send_fcp; } fcp;
struct { struct {
u64 wwpn; u64 wwpn;
u32 d_id; u32 d_id;
...@@ -121,8 +121,8 @@ struct zfcp_hba_dbf_record_response { ...@@ -121,8 +121,8 @@ struct zfcp_hba_dbf_record_response {
struct { struct {
u32 d_id; u32 d_id;
u8 ls_code; u8 ls_code;
} send_els; } els;
} data; } u;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct zfcp_hba_dbf_record_status { struct zfcp_hba_dbf_record_status {
...@@ -154,35 +154,34 @@ struct zfcp_hba_dbf_record { ...@@ -154,35 +154,34 @@ struct zfcp_hba_dbf_record {
struct zfcp_hba_dbf_record_response response; struct zfcp_hba_dbf_record_response response;
struct zfcp_hba_dbf_record_status status; struct zfcp_hba_dbf_record_status status;
struct zfcp_hba_dbf_record_qdio qdio; struct zfcp_hba_dbf_record_qdio qdio;
} type; } u;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct zfcp_san_dbf_record_ct { struct zfcp_san_dbf_record_ct_request {
union {
struct {
u16 cmd_req_code; u16 cmd_req_code;
u8 revision; u8 revision;
u8 gs_type; u8 gs_type;
u8 gs_subtype; u8 gs_subtype;
u8 options; u8 options;
u16 max_res_size; u16 max_res_size;
} request; u32 len;
struct { #define ZFCP_DBF_CT_PAYLOAD 24
u8 payload[ZFCP_DBF_CT_PAYLOAD];
} __attribute__ ((packed));
struct zfcp_san_dbf_record_ct_response {
u16 cmd_rsp_code; u16 cmd_rsp_code;
u8 revision; u8 revision;
u8 reason_code; u8 reason_code;
u8 reason_code_expl; u8 expl;
u8 vendor_unique; u8 vendor_unique;
} response; u32 len;
} type;
u32 payload_size;
#define ZFCP_DBF_CT_PAYLOAD 24
u8 payload[ZFCP_DBF_CT_PAYLOAD]; u8 payload[ZFCP_DBF_CT_PAYLOAD];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct zfcp_san_dbf_record_els { struct zfcp_san_dbf_record_els {
u8 ls_code; u8 ls_code;
u32 payload_size; u32 len;
#define ZFCP_DBF_ELS_PAYLOAD 32 #define ZFCP_DBF_ELS_PAYLOAD 32
#define ZFCP_DBF_ELS_MAX_PAYLOAD 1024 #define ZFCP_DBF_ELS_MAX_PAYLOAD 1024
u8 payload[ZFCP_DBF_ELS_PAYLOAD]; u8 payload[ZFCP_DBF_ELS_PAYLOAD];
...@@ -195,9 +194,10 @@ struct zfcp_san_dbf_record { ...@@ -195,9 +194,10 @@ struct zfcp_san_dbf_record {
u32 s_id; u32 s_id;
u32 d_id; u32 d_id;
union { union {
struct zfcp_san_dbf_record_ct ct; struct zfcp_san_dbf_record_ct_request ct_req;
struct zfcp_san_dbf_record_ct_response ct_resp;
struct zfcp_san_dbf_record_els els; struct zfcp_san_dbf_record_els els;
} type; } u;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct zfcp_scsi_dbf_record { struct zfcp_scsi_dbf_record {
...@@ -215,9 +215,7 @@ struct zfcp_scsi_dbf_record { ...@@ -215,9 +215,7 @@ struct zfcp_scsi_dbf_record {
u64 fsf_reqid; u64 fsf_reqid;
u32 fsf_seqno; u32 fsf_seqno;
u64 fsf_issued; u64 fsf_issued;
union {
u64 old_fsf_reqid; u64 old_fsf_reqid;
struct {
u8 rsp_validity; u8 rsp_validity;
u8 rsp_scsi_status; u8 rsp_scsi_status;
u32 rsp_resid; u32 rsp_resid;
...@@ -226,8 +224,6 @@ struct zfcp_scsi_dbf_record { ...@@ -226,8 +224,6 @@ struct zfcp_scsi_dbf_record {
#define ZFCP_DBF_SCSI_MAX_FCP_SNS_INFO 256 #define ZFCP_DBF_SCSI_MAX_FCP_SNS_INFO 256
u32 sns_info_len; u32 sns_info_len;
u8 sns_info[ZFCP_DBF_SCSI_FCP_SNS_INFO]; u8 sns_info[ZFCP_DBF_SCSI_FCP_SNS_INFO];
} fcp;
} type;
} __attribute__ ((packed)); } __attribute__ ((packed));
#endif /* ZFCP_DBF_H */ #endif /* ZFCP_DBF_H */
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