From 85fcc49fd4a44423fc506fc3c983aece1adc9395 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 23 Jan 2020 09:05:23 -0700 Subject: [PATCH] nvmf/rdma: fix call to spdk_nvmf_rdma_listen This change fixes a merge incompatibility between commits 50cb6a04acf3f77863cc7fe7753dabd79beaab57 and 708ed4fb6e8c41d6033ce26b349171aa77703061. Change-Id: I5bc71a3c214667f01de66857cf61b9eb25f6cf6b Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/482586 Reviewed-by: Jim Harris Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- lib/nvmf/rdma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 07ee9d9bc..545a66ff0 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -2748,7 +2748,9 @@ spdk_nvmf_rdma_listen(struct spdk_nvmf_transport *transport, success: port->ref++; pthread_mutex_unlock(&rtransport->lock); - cb_fn(cb_arg, 0); + if (cb_fn != NULL) { + cb_fn(cb_arg, 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); } while (ref > 0) { - spdk_nvmf_rdma_listen(transport, &trid); + spdk_nvmf_rdma_listen(transport, &trid, NULL, NULL); ref--; } }