On Tue, 2010-09-28 at 10:11 +0200, Christof Schmitt wrote:
> From: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
>
> 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@xxxxxxxxxxxx>
> Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
> ---
Hi Christof,
This patch has been commited into the drop-host_lock-v5 branch and will
be included in the next RFC posting.
Thanks!
--nab
> drivers/s390/scsi/zfcp_dbf.c | 4 ----
> drivers/s390/scsi/zfcp_dbf.h | 2 --
> 2 files changed, 6 deletions(-)
>
> --- 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 ch
> scsi_cmnd = (struct scsi_cmnd *)fsf_req->data;
> if (scsi_cmnd) {
> response->u.fcp.cmnd = (unsigned long)scsi_cmnd;
> - response->u.fcp.serial = scsi_cmnd->serial_number;
> response->u.fcp.data_dir =
> qtcb->bottom.io.data_direction;
> }
> @@ -330,7 +329,6 @@ static void zfcp_dbf_hba_view_response(c
> break;
> zfcp_dbf_out(p, "data_direction", "0x%04x", r->u.fcp.data_dir);
> zfcp_dbf_out(p, "scsi_cmnd", "0x%0Lx", r->u.fcp.cmnd);
> - zfcp_dbf_out(p, "scsi_serial", "0x%016Lx", r->u.fcp.serial);
> *p += sprintf(*p, "\n");
> break;
>
> @@ -881,7 +879,6 @@ void _zfcp_dbf_scsi(const char *tag, con
> }
> rec->scsi_result = scsi_cmnd->result;
> rec->scsi_cmnd = (unsigned long)scsi_cmnd;
> - rec->scsi_serial = scsi_cmnd->serial_number;
> memcpy(rec->scsi_opcode, scsi_cmnd->cmnd,
> min((int)scsi_cmnd->cmd_len,
> ZFCP_DBF_SCSI_OPCODE));
> @@ -950,7 +947,6 @@ static int zfcp_dbf_scsi_view_format(deb
> zfcp_dbf_out(&p, "scsi_lun", "0x%08x", r->scsi_lun);
> zfcp_dbf_out(&p, "scsi_result", "0x%08x", r->scsi_result);
> zfcp_dbf_out(&p, "scsi_cmnd", "0x%0Lx", r->scsi_cmnd);
> - zfcp_dbf_out(&p, "scsi_serial", "0x%016Lx", r->scsi_serial);
> zfcp_dbf_outd(&p, "scsi_opcode", r->scsi_opcode, ZFCP_DBF_SCSI_OPCODE,
> 0, ZFCP_DBF_SCSI_OPCODE);
> zfcp_dbf_out(&p, "scsi_retries", "0x%02x", r->scsi_retries);
> --- a/drivers/s390/scsi/zfcp_dbf.h
> +++ b/drivers/s390/scsi/zfcp_dbf.h
> @@ -110,7 +110,6 @@ struct zfcp_dbf_hba_record_response {
> union {
> struct {
> u64 cmnd;
> - u64 serial;
> u32 data_dir;
> } fcp;
> struct {
> @@ -206,7 +205,6 @@ struct zfcp_dbf_scsi_record {
> u32 scsi_lun;
> u32 scsi_result;
> u64 scsi_cmnd;
> - u64 scsi_serial;
> #define ZFCP_DBF_SCSI_OPCODE 16
> u8 scsi_opcode[ZFCP_DBF_SCSI_OPCODE];
> u8 scsi_retries;
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
