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

nvmf/rdma: fix call to spdk_nvmf_rdma_listen

Browse Source 
This change fixes a merge incompatibility between commits
50cb6a04ac and
708ed4fb6e.

Change-Id: I5bc71a3c214667f01de66857cf61b9eb25f6cf6b
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/482586
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Seth Howell 2020-01-23 09:05:23 -07:00 committed by Jim Harris
parent ca693eaba8
commit 85fcc49fd4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nvmf/rdma.c
View File

@ -2748,7 +2748,9 @@ spdk_nvmf_rdma_listen(struct spdk_nvmf_transport *transport,
success: success:
port->ref++; port->ref++;
pthread_mutex_unlock(&rtransport->lock); pthread_mutex_unlock(&rtransport->lock);
cb_fn(cb_arg, 0); if (cb_fn != NULL) {
cb_fn(cb_arg, 0);
}
return 0; return 0;
} }
@ -2998,7 +3000,7 @@ nvmf_rdma_handle_cm_event_addr_change(struct spdk_nvmf_transport *transport,
spdk_nvmf_rdma_stop_listen(transport, &trid); spdk_nvmf_rdma_stop_listen(transport, &trid);
} }
while (ref > 0) { while (ref > 0) {
spdk_nvmf_rdma_listen(transport, &trid); spdk_nvmf_rdma_listen(transport, &trid, NULL, NULL);
ref--; ref--;
} }
} }