From 28a61c21306c6c249d3377bcaab71275adc0457c Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 28 Aug 2018 12:50:16 -0700 Subject: [PATCH] nvmf/rdma: Simplify event acknowledgement in disconnect path This no longer requires special handling - the event can be acknowledged like all of the others. Change-Id: Ib30cf35ec7aff45734ca6fe729e15d8fe41e3838 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/423935 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Seth Howell Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- lib/nvmf/rdma.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 5bbda97ad..cee1786a6 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -953,10 +953,6 @@ nvmf_rdma_disconnect(struct rdma_cm_event *evt) spdk_nvmf_qpair_disconnect(qpair, NULL, NULL); - /* The qpair memory is guaranteed to exist until this event is - * acknowledged. */ - rdma_ack_cm_event(evt); - return 0; } @@ -1033,7 +1029,7 @@ spdk_nvmf_process_cm_event(struct spdk_nvmf_transport *transport, new_qpair_fn c SPDK_ERRLOG("Unable to process disconnect event. rc: %d\n", rc); break; } - continue; + break; case RDMA_CM_EVENT_MULTICAST_JOIN: case RDMA_CM_EVENT_MULTICAST_ERROR: /* Multicast is not used */