From 80e5f8ba762bdf6d390ca6299e70b91643d9224d Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Sat, 12 Apr 2025 19:03:54 +0300
Subject: [PATCH] Add missing WITH_RDMACM defines

---
 src/client/messenger.cpp | 3 ++-
 src/client/messenger.h   | 1 +
 src/client/msgr_rdma.cpp | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/client/messenger.cpp b/src/client/messenger.cpp
index 2c3e0293..617f2b3f 100644
--- a/src/client/messenger.cpp
+++ b/src/client/messenger.cpp
@@ -800,7 +800,8 @@ bool osd_messenger_t::is_rdma_enabled()
 {
     return rdma_contexts.size() > 0;
 }
-
+#endif
+#ifdef WITH_RDMACM
 bool osd_messenger_t::is_use_rdmacm()
 {
     return use_rdmacm;
diff --git a/src/client/messenger.h b/src/client/messenger.h
index a5437706..18ba0e0e 100644
--- a/src/client/messenger.h
+++ b/src/client/messenger.h
@@ -97,6 +97,7 @@ struct osd_wanted_peer_t
     json11::Json raw_address_list;
     json11::Json address_list;
     int port = 0;
+    // FIXME: Remove separate WITH_RDMACM?
 #ifdef WITH_RDMACM
     int rdmacm_port = 0;
 #endif
diff --git a/src/client/msgr_rdma.cpp b/src/client/msgr_rdma.cpp
index 7c473ba7..5a6682bd 100644
--- a/src/client/msgr_rdma.cpp
+++ b/src/client/msgr_rdma.cpp
@@ -70,6 +70,7 @@ msgr_rdma_context_t::~msgr_rdma_context_t()
 msgr_rdma_connection_t::~msgr_rdma_connection_t()
 {
     ctx->reserve_cqe(-max_send-max_recv);
+#ifdef WITH_RDMACM
     if (qp && !cmid)
         ibv_destroy_qp(qp);
     if (cmid)
@@ -79,6 +80,10 @@ msgr_rdma_connection_t::~msgr_rdma_connection_t()
             rdma_destroy_qp(cmid);
         rdma_destroy_id(cmid);
     }
+#else
+    if (qp)
+        ibv_destroy_qp(qp);
+#endif
     if (recv_buffers.size())
     {
         for (auto b: recv_buffers)