mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 02:23:16 +00:00
Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes
This commit is contained in:
commit
ff682a3dad
@ -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)))
|
||||
(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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user