From aea232c927ad65084ff735d8a1888f970536e5be Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 17 Dec 2014 20:58:09 +0800
Subject: [PATCH] client, librados, osdc: do not shadow Dispatcher::cct

* there is no need to have another cct as Dispatch has one already.
* by `using` the parent member variable in `public`, we expose `cct`
  as part of the interface. so that `cct` can be accessed from
  outside the class.
* and in Objecter, the ctor is initiating its parent class using the
  uninitialized member variable cct. better off fixing this.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---
 src/client/Client.cc        | 1 -
 src/client/Client.h         | 2 +-
 src/librados/RadosClient.cc | 3 +--
 src/librados/RadosClient.h  | 2 +-
 src/osdc/Objecter.h         | 5 ++---
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 1a758470ff7..ce36acb795d 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -152,7 +152,6 @@ dir_result_t::dir_result_t(Inode *in)
 
 Client::Client(Messenger *m, MonClient *mc)
   : Dispatcher(m->cct),
-    cct(m->cct),
     logger(NULL),
     m_command_hook(this),
     timer(m->cct, client_lock),
diff --git a/src/client/Client.h b/src/client/Client.h
index 7b23b6fb0b6..dfc23f6f111 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -208,7 +208,7 @@ struct dir_result_t {
 
 class Client : public Dispatcher {
  public:
-  CephContext *cct;
+  using Dispatcher::cct;
 
   PerfCounters *logger;
 
diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index cce899a9866..a81e1f40e4e 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -65,8 +65,7 @@ bool librados::RadosClient::ms_get_authorizer(int dest_type,
 }
 
 librados::RadosClient::RadosClient(CephContext *cct_)
-  : Dispatcher(cct_),
-    cct(cct_->get()),
+  : Dispatcher(cct_->get()),
     conf(cct_->_conf),
     state(DISCONNECTED),
     monclient(cct_),
diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h
index b3aa1e168d8..7e1c24e5aec 100644
--- a/src/librados/RadosClient.h
+++ b/src/librados/RadosClient.h
@@ -36,7 +36,7 @@ class Messenger;
 class librados::RadosClient : public Dispatcher
 {
 public:
-  CephContext *cct;
+  using Dispatcher::cct;
   md_config_t *conf;
 private:
   enum {
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index c21cd87a1eb..e502a920041 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1007,7 +1007,7 @@ public:
 private:
   OSDMap    *osdmap;
 public:
-  CephContext *cct;
+  using Dispatcher::cct;
   std::multimap<string,string> crush_location;
 
   atomic_t initialized;
@@ -1778,10 +1778,9 @@ public:
 	   Finisher *fin,
 	   double mon_timeout,
 	   double osd_timeout) :
-    Dispatcher(cct),
+    Dispatcher(cct_),
     messenger(m), monc(mc), finisher(fin),
     osdmap(new OSDMap),
-    cct(cct_),
     initialized(0),
     last_tid(0), client_inc(-1), max_linger_id(0),
     num_unacked(0), num_uncommitted(0),
-- 
2.47.3