Commit 542185b7 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

nvme/qpair: merge two if case into one. 



Purpose: To remove the duplicated code.

Change-Id: Iab9989f9928698967533e45e7cffad4f09bde16a
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473376


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 08273e77

lib/nvme/nvme_qpair.c

+8 −7
Original line number Diff line number Diff line
@@ -660,13 +660,14 @@ _nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *r 
		req->submit_tick = 0;

	}



	if (spdk_likely(nvme_qpair_state_equals(qpair, NVME_QPAIR_ENABLED))) {

		rc = nvme_transport_qpair_submit_request(qpair, req);

	} else if (req->cmd.opc == SPDK_NVME_OPC_FABRIC &&

		   nvme_qpair_state_equals(qpair, NVME_QPAIR_CONNECTING)) {

		/* Always allow fabrics commands through - these get

	/* Allow two cases:

	 * 1. NVMe qpair is enabled.

	 * 2. Always allow fabrics commands through - these get

	 * the controller out of reset state.

	 */

	if (spdk_likely(nvme_qpair_state_equals(qpair, NVME_QPAIR_ENABLED)) ||

	    (req->cmd.opc == SPDK_NVME_OPC_FABRIC &&

	     nvme_qpair_state_equals(qpair, NVME_QPAIR_CONNECTING))) {

		rc = nvme_transport_qpair_submit_request(qpair, req);

	} else {

		/* The controller is being reset - queue this request and