From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Mon, 1 Jul 2019 02:41:18 +0000 (+0800)
Subject: msg/async/rdma: make clear to get mem_info address
X-Git-Tag: v15.1.0~1781^2~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a62ce898f3b3f35e762d5d7a6c74cfa7ce091b54;p=ceph.git

msg/async/rdma: make clear to get mem_info address

The parameter "block" points to mem_info::chunks space. It's not quite
clear about the function of "reinterpret_cast<mem_info *>(block) - 1;".
Get the mem_info::chunks address and minus the member offset from struct
head to get mem_info address.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---

diff --git a/src/msg/async/rdma/Infiniband.cc b/src/msg/async/rdma/Infiniband.cc
index f86f3b5cdfed1..5bc19acebd130 100644
--- a/src/msg/async/rdma/Infiniband.cc
+++ b/src/msg/async/rdma/Infiniband.cc
@@ -746,7 +746,8 @@ void Infiniband::MemoryManager::PoolAllocator::free(char * const block)
   mem_info *m;
   std::lock_guard l{lock};
     
-  m = reinterpret_cast<mem_info *>(block) - 1;
+  Chunk *mem_info_chunk = reinterpret_cast<Chunk *>(block);
+  m = reinterpret_cast<mem_info *>(reinterpret_cast<char *>(mem_info_chunk) - offsetof(mem_info, chunks));
   m->ctx->update_stats(-m->nbufs);
   ibv_dereg_mr(m->mr);
   m->ctx->manager->free(m);