Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09d1dc2a authored Oct 15, 2010 by Madhuranath Iyengar Committed by James Bottomley Oct 25, 2010

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



This patch cleans up any printk or debug tracing of the the
serial_number field in the qla2xxx driver.

Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent f19af163

drivers/scsi/qla2xxx/qla_iocb.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -992,8 +992,8 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t sp, struct cmd_type_crc_2 cmd_pkt,
	ha = vha->hw;		ha = vha->hw;

	DEBUG18(printk(KERN_DEBUG		DEBUG18(printk(KERN_DEBUG
	"%s(%ld): Executing cmd sp %p, pid=%ld, prot_op=%u.\n", __func__,		"%s(%ld): Executing cmd sp %p, prot_op=%u.\n", __func__,
	vha->host_no, sp, cmd->serial_number, scsi_get_prot_op(sp->cmd)));		vha->host_no, sp, scsi_get_prot_op(sp->cmd)));

	cmd_pkt->vp_index = sp->fcport->vp_idx;		cmd_pkt->vp_index = sp->fcport->vp_idx;

drivers/scsi/qla2xxx/qla_isr.c

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1431,9 +1431,8 @@ qla2x00_handle_sense(srb_t sp, uint8_t sense_data, uint32_t par_sense_len,
	rsp->status_srb = sp;		rsp->status_srb = sp;

	DEBUG5(printk("%s(): Check condition Sense data, scsi(%ld:%d:%d:%d) "		DEBUG5(printk("%s(): Check condition Sense data, scsi(%ld:%d:%d:%d) "
	"cmd=%p pid=%ld\n", __func__, sp->fcport->vha->host_no,		"cmd=%p\n", __func__, sp->fcport->vha->host_no,
	cp->device->channel, cp->device->id, cp->device->lun, cp,		cp->device->channel, cp->device->id, cp->device->lun, cp));
	cp->serial_number));
	if (sense_len)		if (sense_len)
	DEBUG5(qla2x00_dump_buffer(cp->sense_buffer, sense_len));		DEBUG5(qla2x00_dump_buffer(cp->sense_buffer, sense_len));
	}		}
	@@ -1799,10 +1798,10 @@ qla2x00_status_entry(scsi_qla_host_t vha, struct rsp_que rsp, void *pkt)
	if (logit)		if (logit)
	DEBUG2(qla_printk(KERN_INFO, ha,		DEBUG2(qla_printk(KERN_INFO, ha,
	"scsi(%ld:%d:%d) FCP command status: 0x%x-0x%x (0x%x) "		"scsi(%ld:%d:%d) FCP command status: 0x%x-0x%x (0x%x) "
	"oxid=0x%x ser=0x%lx cdb=%02x%02x%02x len=0x%x "		"oxid=0x%x cdb=%02x%02x%02x len=0x%x "
	"rsp_info=0x%x resid=0x%x fw_resid=0x%x\n", vha->host_no,		"rsp_info=0x%x resid=0x%x fw_resid=0x%x\n", vha->host_no,
	cp->device->id, cp->device->lun, comp_status, scsi_status,		cp->device->id, cp->device->lun, comp_status, scsi_status,
	cp->result, ox_id, cp->serial_number, cp->cmnd[0],		cp->result, ox_id, cp->cmnd[0],
	cp->cmnd[1], cp->cmnd[2], scsi_bufflen(cp), rsp_info_len,		cp->cmnd[1], cp->cmnd[2], scsi_bufflen(cp), rsp_info_len,
	resid_len, fw_resid_len));		resid_len, fw_resid_len));

drivers/scsi/qla2xxx/qla_os.c

+6 −12

Original line number	Original line	Diff line number	Diff line
	@@ -831,7 +831,6 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
	srb_t *sp;		srb_t *sp;
	int ret, i;		int ret, i;
	unsigned int id, lun;		unsigned int id, lun;
	unsigned long serial;
	unsigned long flags;		unsigned long flags;
	int wait = 0;		int wait = 0;
	struct qla_hw_data *ha = vha->hw;		struct qla_hw_data *ha = vha->hw;
	@@ -848,7 +847,6 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)

	id = cmd->device->id;		id = cmd->device->id;
	lun = cmd->device->lun;		lun = cmd->device->lun;
	serial = cmd->serial_number;
	spt = (srb_t *) CMD_SP(cmd);		spt = (srb_t *) CMD_SP(cmd);
	if (!spt)		if (!spt)
	return SUCCESS;		return SUCCESS;
	@@ -866,8 +864,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
	if (sp->cmd != cmd)		if (sp->cmd != cmd)
	continue;		continue;

	DEBUG2(printk("%s(%ld): aborting sp %p from RISC."		DEBUG2(printk("%s(%ld): aborting sp %p from RISC.",
	" pid=%ld.\n", __func__, vha->host_no, sp, serial));		__func__, vha->host_no, sp));

	/* Get a reference to the sp and drop the lock.*/		/* Get a reference to the sp and drop the lock.*/
	sp_get(sp);		sp_get(sp);
	@@ -892,8 +890,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
	if (wait) {		if (wait) {
	if (qla2x00_eh_wait_on_command(cmd) != QLA_SUCCESS) {		if (qla2x00_eh_wait_on_command(cmd) != QLA_SUCCESS) {
	qla_printk(KERN_ERR, ha,		qla_printk(KERN_ERR, ha,
	"scsi(%ld:%d:%d): Abort handler timed out -- %lx "		"scsi(%ld:%d:%d): Abort handler timed out -- %x.\n",
	"%x.\n", vha->host_no, id, lun, serial, ret);		vha->host_no, id, lun, ret);
	ret = FAILED;		ret = FAILED;
	}		}
	}		}
	@@ -902,8 +900,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
	qla2x00_sp_compl(ha, sp);		qla2x00_sp_compl(ha, sp);

	qla_printk(KERN_INFO, ha,		qla_printk(KERN_INFO, ha,
	"scsi(%ld:%d:%d): Abort command issued -- %d %lx %x.\n",		"scsi(%ld:%d:%d): Abort command issued -- %d %x.\n",
	vha->host_no, id, lun, wait, serial, ret);		vha->host_no, id, lun, wait, ret);

	return ret;		return ret;
	}		}
	@@ -1048,13 +1046,11 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
	fc_port_t fcport = (struct fc_port ) cmd->device->hostdata;		fc_port_t fcport = (struct fc_port ) cmd->device->hostdata;
	int ret = FAILED;		int ret = FAILED;
	unsigned int id, lun;		unsigned int id, lun;
	unsigned long serial;

	fc_block_scsi_eh(cmd);		fc_block_scsi_eh(cmd);

	id = cmd->device->id;		id = cmd->device->id;
	lun = cmd->device->lun;		lun = cmd->device->lun;
	serial = cmd->serial_number;

	if (!fcport)		if (!fcport)
	return ret;		return ret;
	@@ -1109,14 +1105,12 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
	struct qla_hw_data *ha = vha->hw;		struct qla_hw_data *ha = vha->hw;
	int ret = FAILED;		int ret = FAILED;
	unsigned int id, lun;		unsigned int id, lun;
	unsigned long serial;
	scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);		scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);

	fc_block_scsi_eh(cmd);		fc_block_scsi_eh(cmd);

	id = cmd->device->id;		id = cmd->device->id;
	lun = cmd->device->lun;		lun = cmd->device->lun;
	serial = cmd->serial_number;

	if (!fcport)		if (!fcport)
	return ret;		return ret;