diff options
-rw-r--r-- | drivers/s390/scsi/zfcp_dbf.c | 4 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_dbf.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index 2224caa8b92d..2cdd6b28ff7f 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c | |||
@@ -154,7 +154,6 @@ void _zfcp_dbf_hba_fsf_response(const char *tag2, int level, | |||
154 | scsi_cmnd = (struct scsi_cmnd *)fsf_req->data; | 154 | scsi_cmnd = (struct scsi_cmnd *)fsf_req->data; |
155 | if (scsi_cmnd) { | 155 | if (scsi_cmnd) { |
156 | response->u.fcp.cmnd = (unsigned long)scsi_cmnd; | 156 | response->u.fcp.cmnd = (unsigned long)scsi_cmnd; |
157 | response->u.fcp.serial = scsi_cmnd->serial_number; | ||
158 | response->u.fcp.data_dir = | 157 | response->u.fcp.data_dir = |
159 | qtcb->bottom.io.data_direction; | 158 | qtcb->bottom.io.data_direction; |
160 | } | 159 | } |
@@ -330,7 +329,6 @@ static void zfcp_dbf_hba_view_response(char **p, | |||
330 | break; | 329 | break; |
331 | zfcp_dbf_out(p, "data_direction", "0x%04x", r->u.fcp.data_dir); | 330 | zfcp_dbf_out(p, "data_direction", "0x%04x", r->u.fcp.data_dir); |
332 | zfcp_dbf_out(p, "scsi_cmnd", "0x%0Lx", r->u.fcp.cmnd); | 331 | zfcp_dbf_out(p, "scsi_cmnd", "0x%0Lx", r->u.fcp.cmnd); |
333 | zfcp_dbf_out(p, "scsi_serial", "0x%016Lx", r->u.fcp.serial); | ||
334 | *p += sprintf(*p, "\n"); | 332 | *p += sprintf(*p, "\n"); |
335 | break; | 333 | break; |
336 | 334 | ||
@@ -881,7 +879,6 @@ void _zfcp_dbf_scsi(const char *tag, const char *tag2, int level, | |||
881 | } | 879 | } |
882 | rec->scsi_result = scsi_cmnd->result; | 880 | rec->scsi_result = scsi_cmnd->result; |
883 | rec->scsi_cmnd = (unsigned long)scsi_cmnd; | 881 | rec->scsi_cmnd = (unsigned long)scsi_cmnd; |
884 | rec->scsi_serial = scsi_cmnd->serial_number; | ||
885 | memcpy(rec->scsi_opcode, scsi_cmnd->cmnd, | 882 | memcpy(rec->scsi_opcode, scsi_cmnd->cmnd, |
886 | min((int)scsi_cmnd->cmd_len, | 883 | min((int)scsi_cmnd->cmd_len, |
887 | ZFCP_DBF_SCSI_OPCODE)); | 884 | ZFCP_DBF_SCSI_OPCODE)); |
@@ -950,7 +947,6 @@ static int zfcp_dbf_scsi_view_format(debug_info_t *id, struct debug_view *view, | |||
950 | zfcp_dbf_out(&p, "scsi_lun", "0x%08x", r->scsi_lun); | 947 | zfcp_dbf_out(&p, "scsi_lun", "0x%08x", r->scsi_lun); |
951 | zfcp_dbf_out(&p, "scsi_result", "0x%08x", r->scsi_result); | 948 | zfcp_dbf_out(&p, "scsi_result", "0x%08x", r->scsi_result); |
952 | zfcp_dbf_out(&p, "scsi_cmnd", "0x%0Lx", r->scsi_cmnd); | 949 | zfcp_dbf_out(&p, "scsi_cmnd", "0x%0Lx", r->scsi_cmnd); |
953 | zfcp_dbf_out(&p, "scsi_serial", "0x%016Lx", r->scsi_serial); | ||
954 | zfcp_dbf_outd(&p, "scsi_opcode", r->scsi_opcode, ZFCP_DBF_SCSI_OPCODE, | 950 | zfcp_dbf_outd(&p, "scsi_opcode", r->scsi_opcode, ZFCP_DBF_SCSI_OPCODE, |
955 | 0, ZFCP_DBF_SCSI_OPCODE); | 951 | 0, ZFCP_DBF_SCSI_OPCODE); |
956 | zfcp_dbf_out(&p, "scsi_retries", "0x%02x", r->scsi_retries); | 952 | zfcp_dbf_out(&p, "scsi_retries", "0x%02x", r->scsi_retries); |
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h index 6a48c197b45d..04081b1b62b4 100644 --- a/drivers/s390/scsi/zfcp_dbf.h +++ b/drivers/s390/scsi/zfcp_dbf.h | |||
@@ -110,7 +110,6 @@ struct zfcp_dbf_hba_record_response { | |||
110 | union { | 110 | union { |
111 | struct { | 111 | struct { |
112 | u64 cmnd; | 112 | u64 cmnd; |
113 | u64 serial; | ||
114 | u32 data_dir; | 113 | u32 data_dir; |
115 | } fcp; | 114 | } fcp; |
116 | struct { | 115 | struct { |
@@ -206,7 +205,6 @@ struct zfcp_dbf_scsi_record { | |||
206 | u32 scsi_lun; | 205 | u32 scsi_lun; |
207 | u32 scsi_result; | 206 | u32 scsi_result; |
208 | u64 scsi_cmnd; | 207 | u64 scsi_cmnd; |
209 | u64 scsi_serial; | ||
210 | #define ZFCP_DBF_SCSI_OPCODE 16 | 208 | #define ZFCP_DBF_SCSI_OPCODE 16 |
211 | u8 scsi_opcode[ZFCP_DBF_SCSI_OPCODE]; | 209 | u8 scsi_opcode[ZFCP_DBF_SCSI_OPCODE]; |
212 | u8 scsi_retries; | 210 | u8 scsi_retries; |