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

Commit c835c085 authored Mar 12, 2019 by James Smart Committed by Martin K. Petersen Mar 19, 2019

scsi: lpfc: Fix duplicate log message numbers



Driver had duplicated log message numbers making debug difficult.

Make all messages unique.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent c1a21ebc

drivers/scsi/lpfc/lpfc_ct.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -886,7 +886,7 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
	}		}
	if (lpfc_error_lost_link(irsp)) {		if (lpfc_error_lost_link(irsp)) {
	lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
	"4101 NS query failed due to link event\n");		"4166 NS query failed due to link event\n");
	if (vport->fc_flag & FC_RSCN_MODE)		if (vport->fc_flag & FC_RSCN_MODE)
	lpfc_els_flush_rscn(vport);		lpfc_els_flush_rscn(vport);
	goto out;		goto out;
	@@ -907,7 +907,7 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
	* Re-issue the NS cmd		* Re-issue the NS cmd
	*/		*/
	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,		lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
	"4102 Process Deferred RSCN Data: x%x x%x\n",		"4167 Process Deferred RSCN Data: x%x x%x\n",
	vport->fc_flag, vport->fc_rscn_id_cnt);		vport->fc_flag, vport->fc_rscn_id_cnt);
	lpfc_els_handle_rscn(vport);		lpfc_els_handle_rscn(vport);

drivers/scsi/lpfc/lpfc_debugfs.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5891,7 +5891,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
	phba, &lpfc_debugfs_op_lockstat);		phba, &lpfc_debugfs_op_lockstat);
	if (!phba->debug_lockstat) {		if (!phba->debug_lockstat) {
	lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
	"0913 Cant create debugfs lockstat\n");		"4610 Cant create debugfs lockstat\n");
	goto debug_failed;		goto debug_failed;
	}		}
	#endif		#endif
	@@ -6134,7 +6134,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
	vport, &lpfc_debugfs_op_scsistat);		vport, &lpfc_debugfs_op_scsistat);
	if (!vport->debug_scsistat) {		if (!vport->debug_scsistat) {
	lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
	"0914 Cannot create debugfs scsistat\n");		"4611 Cannot create debugfs scsistat\n");
	goto debug_failed;		goto debug_failed;
	}		}

drivers/scsi/lpfc/lpfc_init.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9272,7 +9272,7 @@ lpfc_create_wq_cq(struct lpfc_hba phba, struct lpfc_queue eq,
	rc = lpfc_wq_create(phba, wq, cq, qtype);		rc = lpfc_wq_create(phba, wq, cq, qtype);
	if (rc) {		if (rc) {
	lpfc_printf_log(phba, KERN_ERR, LOG_INIT,		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
	"6123 Fail setup fastpath WQ (%d), rc = 0x%x\n",		"4618 Fail setup fastpath WQ (%d), rc = 0x%x\n",
	qidx, (uint32_t)rc);		qidx, (uint32_t)rc);
	/* no need to tear down cq - caller will do so */		/* no need to tear down cq - caller will do so */
	return rc;		return rc;