| Message ID | 1482208424-12358-10-git-send-email-himanshu.madhani@cavium.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, Dec 19, 2016 at 08:33:43PM -0800, Himanshu Madhani wrote: > From: Quinn Tran <quinn.tran@cavium.com> > > Termination of Immediate Notify IOCB was using wrong > IOCB handle. IOCB completion code was unable to find > appropriate code path due to wrong handle. > > Following message is seen in the logs. > > "Error entry - invalid handle/queue (ffff)." > > Signed-off-by: Quinn Tran <quinn.tran@cavium.com> > Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> > --- > drivers/scsi/qla2xxx/qla_isr.c | 4 ++++ > drivers/scsi/qla2xxx/qla_target.c | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c > index af840bf..16bc948 100644 > --- a/drivers/scsi/qla2xxx/qla_isr.c > +++ b/drivers/scsi/qla2xxx/qla_isr.c > @@ -2495,6 +2495,10 @@ struct scsi_dif_tuple { > if (pkt->entry_status & RF_BUSY) > res = DID_BUS_BUSY << 16; > > + if ((pkt->entry_type == NOTIFY_ACK_TYPE) && > + (pkt->handle == QLA_TGT_SKIP_HANDLE)) > + return; No need for the inner braces. Otherwise this looks fine: Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index af840bf..16bc948 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -2495,6 +2495,10 @@ struct scsi_dif_tuple { if (pkt->entry_status & RF_BUSY) res = DID_BUS_BUSY << 16; + if ((pkt->entry_type == NOTIFY_ACK_TYPE) && + (pkt->handle == QLA_TGT_SKIP_HANDLE)) + return; + sp = qla2x00_get_sp_from_handle(vha, func, req, pkt); if (sp) { sp->done(ha, sp, res); diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 7ae179a..64e9abb 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -3061,7 +3061,7 @@ static int __qlt_send_term_imm_notif(struct scsi_qla_host *vha, pkt->entry_type = NOTIFY_ACK_TYPE; pkt->entry_count = 1; - pkt->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK; + pkt->handle = QLA_TGT_SKIP_HANDLE; nack = (struct nack_to_isp *)pkt; nack->ox_id = ntfy->ox_id;