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

nvmf: Make the function spdk_nvmf_rdma_acceptor_init() reentrant.

Browse Source 
Change-Id: Ie715affe7e451fc517c5f57f1597d0bc70f69947
Signed-off-by: Cunyin Chang <cunyin.chang@intel.com>
This commit is contained in:
Cunyin Chang 2016-09-13 10:49:49 +08:00 committed by Daniel Verkamp
parent 4c0aab3f2a
commit b3ca958328
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nvmf/rdma.c
View File

@ -981,7 +981,7 @@ spdk_nvmf_rdma_acceptor_init(void)
if (g_rdma.num_devices_found == 0) { if (g_rdma.num_devices_found == 0) {
return 0; return 0;
} }
if (g_rdma.acceptor_event_channel == NULL) {
/* create an event channel with rdmacm to receive /* create an event channel with rdmacm to receive
connection oriented requests and notifications */ connection oriented requests and notifications */
g_rdma.acceptor_event_channel = rdma_create_event_channel(); g_rdma.acceptor_event_channel = rdma_create_event_channel();
@ -994,9 +994,13 @@ spdk_nvmf_rdma_acceptor_init(void)
SPDK_ERRLOG("fcntl to set fd to non-blocking failed\n"); SPDK_ERRLOG("fcntl to set fd to non-blocking failed\n");
goto create_id_error; goto create_id_error;
} }
}
pthread_mutex_lock(&g_rdma.lock); pthread_mutex_lock(&g_rdma.lock);
TAILQ_FOREACH_SAFE(listen_addr, &g_rdma.listen_addrs, link, tmp) { TAILQ_FOREACH_SAFE(listen_addr, &g_rdma.listen_addrs, link, tmp) {
if (listen_addr->id) {
continue;
}
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_addr.s_addr = inet_addr(listen_addr->traddr); addr.sin_addr.s_addr = inet_addr(listen_addr->traddr);