From 6d2989fdecb1e87a53bde0b4ecdae300500c7a0f Mon Sep 17 00:00:00 2001 From: Anil Veerabhadrappa Date: Sun, 13 Oct 2019 21:08:23 -0700 Subject: [PATCH] nvmf: optimize listen address parsing code Optimize code Signed-off-by: Anil Veerabhadrappa Change-Id: I2debb9ec8af04a13feedfe53f56a3e539d06caf5 Signed-off-by: Anil Veerabhadrappa Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471206 Tested-by: SPDK CI Jenkins Community-CI: Broadcom SPDK FC-NVMe CI Reviewed-by: Shuhei Matsumoto Reviewed-by: Alexey Marchuk Reviewed-by: Jim Harris --- module/event/subsystems/nvmf/conf.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/module/event/subsystems/nvmf/conf.c b/module/event/subsystems/nvmf/conf.c index 1b3b71978..e686505fd 100644 --- a/module/event/subsystems/nvmf/conf.c +++ b/module/event/subsystems/nvmf/conf.c @@ -290,6 +290,7 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) { const char *nqn, *mode; size_t i; + int ret = -1; int lcore; bool allow_any_host; bool allow_any_listener = true; @@ -459,19 +460,17 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) if (trid.trtype == SPDK_NVME_TRANSPORT_RDMA || trid.trtype == SPDK_NVME_TRANSPORT_TCP) { - if (spdk_nvmf_tgt_parse_listen_ip_addr(address_dup, &trid)) { - free(address_dup); - continue; - } + ret = spdk_nvmf_tgt_parse_listen_ip_addr(address_dup, &trid); } else if (trid.trtype == SPDK_NVME_TRANSPORT_FC) { - if (spdk_nvmf_tgt_parse_listen_fc_addr(address_dup, &trid)) { - free(address_dup); - continue; - } + ret = spdk_nvmf_tgt_parse_listen_fc_addr(address_dup, &trid); } free(address_dup); + if (ret) { + continue; + } + spdk_nvmf_tgt_listen(g_spdk_nvmf_tgt, &trid, spdk_nvmf_tgt_listen_done, NULL); spdk_nvmf_subsystem_add_listener(subsystem, &trid);