| From 083948e5653ffb4840bb761a93d71b13de196663 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 10 Sep 2018 10:30:48 -0700 |
| Subject: scsi: lpfc: Fix errors in log messages. |
| |
| From: James Smart <jsmart2021@gmail.com> |
| |
| [ Upstream commit 2879265f514b1f4154288243c91438ddbedb3ed4 ] |
| |
| Message 6408 is displayed for each entry in an array, but the cpu and queue |
| numbers were incorrect for the entry. Message 6001 includes an extraneous |
| character. |
| |
| Resolve both issues |
| |
| Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> |
| Signed-off-by: James Smart <james.smart@broadcom.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/lpfc/lpfc_nvme.c | 2 +- |
| drivers/scsi/lpfc/lpfc_nvmet.c | 7 +++---- |
| 2 files changed, 4 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c |
| index 645ffb5332b4a..8ee585e453dcf 100644 |
| --- a/drivers/scsi/lpfc/lpfc_nvme.c |
| +++ b/drivers/scsi/lpfc/lpfc_nvme.c |
| @@ -282,7 +282,7 @@ lpfc_nvme_delete_queue(struct nvme_fc_local_port *pnvme_lport, |
| vport = lport->vport; |
| |
| lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME, |
| - "6001 ENTER. lpfc_pnvme %p, qidx x%xi qhandle %p\n", |
| + "6001 ENTER. lpfc_pnvme %p, qidx x%x qhandle %p\n", |
| lport, qidx, handle); |
| kfree(handle); |
| } |
| diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c |
| index 22efefcc6cd84..768eba8c111d9 100644 |
| --- a/drivers/scsi/lpfc/lpfc_nvmet.c |
| +++ b/drivers/scsi/lpfc/lpfc_nvmet.c |
| @@ -1340,15 +1340,14 @@ lpfc_nvmet_setup_io_context(struct lpfc_hba *phba) |
| idx = 0; |
| } |
| |
| - infop = phba->sli4_hba.nvmet_ctx_info; |
| - for (j = 0; j < phba->cfg_nvmet_mrq; j++) { |
| - for (i = 0; i < phba->sli4_hba.num_present_cpu; i++) { |
| + for (i = 0; i < phba->sli4_hba.num_present_cpu; i++) { |
| + for (j = 0; j < phba->cfg_nvmet_mrq; j++) { |
| + infop = lpfc_get_ctx_list(phba, i, j); |
| lpfc_printf_log(phba, KERN_INFO, LOG_NVME | LOG_INIT, |
| "6408 TOTAL NVMET ctx for CPU %d " |
| "MRQ %d: cnt %d nextcpu %p\n", |
| i, j, infop->nvmet_ctx_list_cnt, |
| infop->nvmet_ctx_next_cpu); |
| - infop++; |
| } |
| } |
| return 0; |
| -- |
| 2.20.1 |
| |
