Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit bf5eefb007e7c5498a41af2dd65d957ae9793a63

Authored by Christof Schmitt
Committed by James Bottomley
1 parent 7262026f0e
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[SCSI] zfcp: Remove scsi_cmnd->serial_number from debug traces 

With the change that drivers have to explicitly request the serial
number for SCSI commands, this field should not be part of the zfcp
traces. It is not worth the effort to request the serial number only
for tracing purposes, so simply remove this field from the debug
traces.

Reviewed-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>

Showing 2 changed files with 0 additions and 6 deletions Side-by-side Diff

drivers/s390/scsi/zfcp_dbf.c
Diff comments   View file @ bf5eefb
... ... @@ -154,7 +154,6 @@
154 154 scsi_cmnd = (struct scsi_cmnd *)fsf_req->data;
155 155 if (scsi_cmnd) {
156 156 response->u.fcp.cmnd = (unsigned long)scsi_cmnd;
157   - response->u.fcp.serial = scsi_cmnd->serial_number;
158 157 response->u.fcp.data_dir =
159 158 qtcb->bottom.io.data_direction;
160 159 }
... ... @@ -330,7 +329,6 @@
330 329 break;
331 330 zfcp_dbf_out(p, "data_direction", "0x%04x", r->u.fcp.data_dir);
332 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 332 *p += sprintf(*p, "\n");
335 333 break;
336 334  
... ... @@ -881,7 +879,6 @@
881 879 }
882 880 rec->scsi_result = scsi_cmnd->result;
883 881 rec->scsi_cmnd = (unsigned long)scsi_cmnd;
884   - rec->scsi_serial = scsi_cmnd->serial_number;
885 882 memcpy(rec->scsi_opcode, scsi_cmnd->cmnd,
886 883 min((int)scsi_cmnd->cmd_len,
887 884 ZFCP_DBF_SCSI_OPCODE));
... ... @@ -950,7 +947,6 @@
950 947 zfcp_dbf_out(&p, "scsi_lun", "0x%08x", r->scsi_lun);
951 948 zfcp_dbf_out(&p, "scsi_result", "0x%08x", r->scsi_result);
952 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 950 zfcp_dbf_outd(&p, "scsi_opcode", r->scsi_opcode, ZFCP_DBF_SCSI_OPCODE,
955 951 0, ZFCP_DBF_SCSI_OPCODE);
956 952 zfcp_dbf_out(&p, "scsi_retries", "0x%02x", r->scsi_retries);
drivers/s390/scsi/zfcp_dbf.h
Diff comments   View file @ bf5eefb
... ... @@ -110,7 +110,6 @@
110 110 union {
111 111 struct {
112 112 u64 cmnd;
113   - u64 serial;
114 113 u32 data_dir;
115 114 } fcp;
116 115 struct {
... ... @@ -206,7 +205,6 @@
206 205 u32 scsi_lun;
207 206 u32 scsi_result;
208 207 u64 scsi_cmnd;
209   - u64 scsi_serial;
210 208 #define ZFCP_DBF_SCSI_OPCODE 16
211 209 u8 scsi_opcode[ZFCP_DBF_SCSI_OPCODE];
212 210 u8 scsi_retries;