ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/qpair: merge two if case into one.

Browse Source 
Purpose: To remove the duplicated code.

Change-Id: Iab9989f9928698967533e45e7cffad4f09bde16a
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473376
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ziye Yang 2019-11-06 22:31:00 +08:00 committed by Jim Harris
parent 08273e77de
commit 542185b7e0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/nvme/nvme_qpair.c
View File

@ -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
* the controller out of reset state.
*/
/* 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