From c2df8f6d8482f0cdd6530470f52168f361c2f03b Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Mon, 21 Oct 2019 10:28:35 -0700 Subject: [PATCH] nvme: unify ctrlr_scan function between rdma & tcp These functions are functionally equivalent. Just unify the way they wait for completions so that they are completely identical and we can merge them into a common function. Change-Id: Id5d734b6ae613b3ac828d89853d986cdadfb211a Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471936 Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: Alexey Marchuk Tested-by: SPDK CI Jenkins --- lib/nvme/nvme_tcp.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index a83d53309..0b80aedcd 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -321,10 +321,7 @@ nvme_tcp_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx, return rc; } - while (status.done == false) { - spdk_nvme_qpair_process_completions(discovery_ctrlr->adminq, 0); - } - if (spdk_nvme_cpl_is_error(&status.cpl)) { + if (spdk_nvme_wait_for_completion(discovery_ctrlr->adminq, &status)) { SPDK_ERRLOG("nvme_identify_controller failed!\n"); return -ENXIO; } @@ -340,7 +337,6 @@ nvme_tcp_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx, rc = nvme_fabric_ctrlr_discover(discovery_ctrlr, probe_ctx); nvme_ctrlr_destruct(discovery_ctrlr); - SPDK_DEBUGLOG(SPDK_LOG_NVME, "leave\n"); return rc; }