From 542185b7e04ab4384f151cb7a82fe66f1ff4a169 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Wed, 6 Nov 2019 22:31:00 +0800 Subject: [PATCH] nvme/qpair: merge two if case into one. Purpose: To remove the duplicated code. Change-Id: Iab9989f9928698967533e45e7cffad4f09bde16a Signed-off-by: Ziye Yang Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473376 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- lib/nvme/nvme_qpair.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c index 63508c03f..ec743b78a 100644 --- a/lib/nvme/nvme_qpair.c +++ b/lib/nvme/nvme_qpair.c @@ -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