lpfc 8.3.32: Correct Smatch Error in lpfc_sli.c
Subsystems (2)
PATCH 2/10 lpfc 8.3.32: Correct Smatch Error in lpfc_sli.c
This patch corrects the issue caught vi Smatch and reported by Dan Carpenter:
http://marc.info/?l=linux-scsi&m=133693516103343&w=2
Resolve null pointer check ordering that were odd
Signed-off-by Alex Iannicelli <[email protected]>
Signed-off-by James Smart <[email protected]>
---
lpfc_sli.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +7 -13
@@ -15863,24 +15863,18 @@ lpfc_drain_txq(struct lpfc_hba *phba)spin_lock_irqsave (&phba->hbalock, iflags); piocbq =lpfc_sli_ringtx_get (phba, pring); +if (!piocbq) { +spin_unlock_irqrestore (&phba->hbalock, iflags); +lpfc_printf_log (phba,KERN_ERR ,LOG_SLI , +"2823 txq empty and txq_cnt is %d\n " , + pring->txq_cnt); +break ; + } sglq =__lpfc_sli_get_sglq (phba, piocbq);if (!sglq) {__lpfc_sli_ringtx_put (phba, pring, piocbq);spin_unlock_irqrestore (&phba->hbalock, iflags);break ; - }else { -if (!piocbq) { -/* The txq_cnt out of sync. This should -* never happen -*/ - sglq =__lpfc_clear_active_sglq (phba, - sglq->sli4_lxritag); -spin_unlock_irqrestore (&phba->hbalock, iflags); -lpfc_printf_log (phba,KERN_ERR ,LOG_SLI , -"2823 txq empty and txq_cnt is %d\n " , - pring->txq_cnt); -break ; - } }/* The xri and iocb resources secured,