From f88b410652ff9306a25a523eaccddaaf03342101 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Sun, 6 Dec 2020 15:41:49 +0800
Subject: [PATCH] librados: move definition of cct_deleter to .cc

so cct->get() and cct->put() are visually closer. this improves the
readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/librados/RadosClient.cc | 4 +++-
 src/librados/RadosClient.h  | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 5915e6a147a68..47b928058c4f5 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -56,7 +56,9 @@ namespace ca = ceph::async;
 namespace cb = ceph::buffer;
 
 librados::RadosClient::RadosClient(CephContext *cct_)
-  : Dispatcher(cct_->get()) {
+  : Dispatcher(cct_->get()),
+    cct_deleter{cct, [](CephContext *p) {p->put();}}
+{
   auto& conf = cct->_conf;
   conf.add_observer(this);
   rados_mon_op_timeout = conf.get_val<std::chrono::seconds>("rados_mon_op_timeout");
diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h
index 10d3baea13da9..0db094b180094 100644
--- a/src/librados/RadosClient.h
+++ b/src/librados/RadosClient.h
@@ -50,8 +50,7 @@ public:
   using Dispatcher::cct;
 private:
   std::unique_ptr<CephContext,
-		  std::function<void(CephContext*)> > cct_deleter{
-    cct, [](CephContext *p) {p->put();}};
+		  std::function<void(CephContext*)>> cct_deleter;
 
 public:
   const ConfigProxy& conf{cct->_conf};
-- 
2.47.3