| From e97c6969923d8764b97646a6259e524cd6152017 Mon Sep 17 00:00:00 2001 |
| From: James Smart <jsmart2021@gmail.com> |
| Date: Tue, 12 Mar 2019 16:30:04 -0700 |
| Subject: scsi: lpfc: Resolve inconsistent check of hdwq in |
| lpfc_scsi_cmd_iocb_cmpl |
| |
| [ Upstream commit ff6bf89717b0dc7b8dd0934d1c065f29069831e7 ] |
| |
| A prior patch which added support for non-uniform allocation of MSIX |
| vectors now causes a smatch complaint: |
| |
| drivers/scsi/lpfc/lpfc_scsi.c:3674 lpfc_scsi_cmd_iocb_cmpl() |
| error: we previously assumed 'phba->sli4_hba.hdwq' could be |
| null (see line 3667) |
| |
| Resolve by removing the unnecessary check for a NULL hdwq table. |
| |
| Fixes 6a828b0f6192: ("scsi: lpfc: Support non-uniform allocation of MSIX vectors to hardware queues") |
| Reported-by: Dan Carpenter <dan.carpenter@oracle.com> |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/lpfc/lpfc_scsi.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c |
| index a497b2c0cb798..25501d4605ff3 100644 |
| --- a/drivers/scsi/lpfc/lpfc_scsi.c |
| +++ b/drivers/scsi/lpfc/lpfc_scsi.c |
| @@ -3670,7 +3670,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, |
| #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
| if (phba->cpucheck_on & LPFC_CHECK_SCSI_IO) { |
| cpu = smp_processor_id(); |
| - if (cpu < LPFC_CHECK_CPU_CNT) |
| + if (cpu < LPFC_CHECK_CPU_CNT && phba->sli4_hba.hdwq) |
| phba->sli4_hba.hdwq[idx].cpucheck_cmpl_io[cpu]++; |
| } |
| #endif |
| -- |
| 2.20.1 |
| |