[SCSI] lpfc: Fix for "command completion for iotax x?? not found"

From: James Smart <James.Smart@emulex.com>

There were scenarios where the error handlers could reuse an iotag
value of an active io.  Remove all possibility of this by
pre-assigning iotag resources to command resources.

Signed-off-by: James Smart <James.Smart@emulex.com>

Rejections fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 9a58de876d40..507a6af56f42 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -187,10 +187,8 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
                                         spin_unlock_irq(phba->host->host_lock);
                                         (iocb->iocb_cmpl) (phba, iocb, iocb);
                                         spin_lock_irq(phba->host->host_lock);
-                                } else {
-                                        list_add_tail(&iocb->list,
-                                                        &phba->lpfc_iocb_list);
-                                }
+                                } else
+                                        lpfc_sli_release_iocbq(phba, iocb);
                                 break;
                         }
                 }
@@ -232,10 +230,8 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
                                         spin_unlock_irq(phba->host->host_lock);
                                         (iocb->iocb_cmpl) (phba, iocb, iocb);
                                         spin_lock_irq(phba->host->host_lock);
-                                } else {
-                                        list_add_tail(&iocb->list,
-                                                        &phba->lpfc_iocb_list);
-                                }
+                                } else
+                                        lpfc_sli_release_iocbq(phba, iocb);
                                 break;
                         }
                 }