SCSI fixes for 4.9-rc8
Subsystems (2)
James Bottomley
maintainerOne small fix for a regression in a prior fix (again). This time the condition in the prior fix BUG_ON proved to be wrong under certain circumstances causing a BUG to trigger where it shouldn't in the lpfc driver.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Mauricio Faria de Oliveira (1):
scsi: lpfc: fix oops/BUG in lpfc_sli_ringtxcmpl_put()
And the diffstat:
drivers/scsi/lpfc/lpfc_sli.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
With full diff below.
James
---
drivers/scsi/lpfc/lpfc_sli.c +8 -6
@@ -1323,18 +1323,20 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, {lockdep_assert_held (&phba->hbalock); -BUG_ON (!piocb || !piocb->vport); +BUG_ON (!piocb);list_add_tail (&piocb->list, &pring->txcmplq); piocb->iocb_flag |=LPFC_IO_ON_TXCMPLQ ;if ((unlikely (pring->ringno ==LPFC_ELS_RING )) && (piocb->iocb.ulpCommand !=CMD_ABORT_XRI_CN ) && - (piocb->iocb.ulpCommand !=CMD_CLOSE_XRI_CN ) && - (!(piocb->vport->load_flag &FC_UNLOADING ))) -mod_timer (&piocb->vport->els_tmofunc, - jiffies + -msecs_to_jiffies (1000 * (phba->fc_ratov <<1 ))); + (piocb->iocb.ulpCommand !=CMD_CLOSE_XRI_CN )) { +BUG_ON (!piocb->vport); +if (!(piocb->vport->load_flag &FC_UNLOADING )) +mod_timer (&piocb->vport->els_tmofunc, + jiffies + +msecs_to_jiffies (1000 * (phba->fc_ratov <<1 ))); + }return 0 ; }