Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5068b46 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix IO submission if WQ is full 



For both initiator and target: if WQ is full, return -EBUSY.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b06a622f

drivers/scsi/lpfc/lpfc_nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport, 
				 "sid: x%x did: x%x oxid: x%x\n",

				 ret, vport->fc_myDID, ndlp->nlp_DID,

				 lpfc_ncmd->cur_iocbq.sli4_xritag);

		ret = -EINVAL;

		ret = -EBUSY;

		goto out_free_nvme_buf;

	}

drivers/scsi/lpfc/lpfc_nvmet.c

+4 −1
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport, 
		lpfc_printf_log(phba, KERN_ERR, LOG_NVME_IOERR,

				"6102 Bad state IO x%x aborted\n",

				ctxp->oxid);

		rc = -ENXIO;

		goto aerr;

	}
@@ -580,6 +581,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport, 
		lpfc_printf_log(phba, KERN_ERR, LOG_NVME_IOERR,

				"6152 FCP Drop IO x%x: Prep\n",

				ctxp->oxid);

		rc = -ENXIO;

		goto aerr;

	}
@@ -618,8 +620,9 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport, 
	ctxp->wqeq->hba_wqidx = 0;

	nvmewqeq->context2 = NULL;

	nvmewqeq->context3 = NULL;

	rc = -EBUSY;

aerr:

	return -ENXIO;

	return rc;

}



static void