From b3ca95832828fdb04140e5838b54089a0650ba72 Mon Sep 17 00:00:00 2001 From: Cunyin Chang Date: Tue, 13 Sep 2016 10:49:49 +0800 Subject: [PATCH] nvmf: Make the function spdk_nvmf_rdma_acceptor_init() reentrant. Change-Id: Ie715affe7e451fc517c5f57f1597d0bc70f69947 Signed-off-by: Cunyin Chang --- lib/nvmf/rdma.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index a10cd4083..f453baf1a 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -981,22 +981,26 @@ spdk_nvmf_rdma_acceptor_init(void) if (g_rdma.num_devices_found == 0) { return 0; } - - /* create an event channel with rdmacm to receive - connection oriented requests and notifications */ - g_rdma.acceptor_event_channel = rdma_create_event_channel(); if (g_rdma.acceptor_event_channel == NULL) { - SPDK_ERRLOG("rdma_create_event_channel() failed\n"); - return -1; - } - rc = fcntl(g_rdma.acceptor_event_channel->fd, F_SETFL, O_NONBLOCK); - if (rc < 0) { - SPDK_ERRLOG("fcntl to set fd to non-blocking failed\n"); - goto create_id_error; + /* create an event channel with rdmacm to receive + connection oriented requests and notifications */ + g_rdma.acceptor_event_channel = rdma_create_event_channel(); + if (g_rdma.acceptor_event_channel == NULL) { + SPDK_ERRLOG("rdma_create_event_channel() failed\n"); + return -1; + } + rc = fcntl(g_rdma.acceptor_event_channel->fd, F_SETFL, O_NONBLOCK); + if (rc < 0) { + SPDK_ERRLOG("fcntl to set fd to non-blocking failed\n"); + goto create_id_error; + } } pthread_mutex_lock(&g_rdma.lock); TAILQ_FOREACH_SAFE(listen_addr, &g_rdma.listen_addrs, link, tmp) { + if (listen_addr->id) { + continue; + } memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr(listen_addr->traddr);