Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fix from James Bottomley:
"One 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"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: lpfc: fix oops/BUG in lpfc_sli_ringtxcmpl_put()
+8
-6
+8
-6
drivers/scsi/lpfc/lpfc_sli.c
+8
-6
drivers/scsi/lpfc/lpfc_sli.c
···
1323
1323
{
1324
1324
lockdep_assert_held(&phba->hbalock);
1325
1325
1326
-
BUG_ON(!piocb || !piocb->vport);
1326
+
BUG_ON(!piocb);
1327
1327
1328
1328
list_add_tail(&piocb->list, &pring->txcmplq);
1329
1329
piocb->iocb_flag |= LPFC_IO_ON_TXCMPLQ;
1330
1330
1331
1331
if ((unlikely(pring->ringno == LPFC_ELS_RING)) &&
1332
1332
(piocb->iocb.ulpCommand != CMD_ABORT_XRI_CN) &&
1333
-
(piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN) &&
1334
-
(!(piocb->vport->load_flag & FC_UNLOADING)))
1335
-
mod_timer(&piocb->vport->els_tmofunc,
1336
-
jiffies +
1337
-
msecs_to_jiffies(1000 * (phba->fc_ratov << 1)));
1333
+
(piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN)) {
1334
+
BUG_ON(!piocb->vport);
1335
+
if (!(piocb->vport->load_flag & FC_UNLOADING))
1336
+
mod_timer(&piocb->vport->els_tmofunc,
1337
+
jiffies +
1338
+
msecs_to_jiffies(1000 * (phba->fc_ratov << 1)));
1339
+
}
1338
1340
1339
1341
return 0;
1340
1342
}