Commit ff682a3d authored by James Bottomley's avatar James Bottomley

Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes

parents c65c945c 2319f847
...@@ -1323,18 +1323,20 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, ...@@ -1323,18 +1323,20 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
{ {
lockdep_assert_held(&phba->hbalock); lockdep_assert_held(&phba->hbalock);
BUG_ON(!piocb || !piocb->vport); BUG_ON(!piocb);
list_add_tail(&piocb->list, &pring->txcmplq); list_add_tail(&piocb->list, &pring->txcmplq);
piocb->iocb_flag |= LPFC_IO_ON_TXCMPLQ; piocb->iocb_flag |= LPFC_IO_ON_TXCMPLQ;
if ((unlikely(pring->ringno == LPFC_ELS_RING)) && if ((unlikely(pring->ringno == LPFC_ELS_RING)) &&
(piocb->iocb.ulpCommand != CMD_ABORT_XRI_CN) && (piocb->iocb.ulpCommand != CMD_ABORT_XRI_CN) &&
(piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN) && (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN)) {
(!(piocb->vport->load_flag & FC_UNLOADING))) BUG_ON(!piocb->vport);
mod_timer(&piocb->vport->els_tmofunc, if (!(piocb->vport->load_flag & FC_UNLOADING))
jiffies + mod_timer(&piocb->vport->els_tmofunc,
msecs_to_jiffies(1000 * (phba->fc_ratov << 1))); jiffies +
msecs_to_jiffies(1000 * (phba->fc_ratov << 1)));
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment