scsi: lpfc: Fix errors in log messages.

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>

diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index a84299c36c9f0d6708fd432d9f7c63d6abc794da..543873232d5aca5b65ff29c09217dae19bf03bc6 100644 (file)
--- 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 4926ca6f0b8c8d7c89f734635fe1030335528c49..6245f442d784bed3056de8c0830cd9e687b59a6a 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nvmet.c
+++ b/drivers/scsi/lpfc/lpfc_nvmet.c
@@ -1339,15 +1339,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;