added consts, cleanup

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>

diff --git a/src/common/Mutex.h b/src/common/Mutex.h
index e2ebe1fa6e8f4818b604e85f6f7a6f25c8b1133e..758157536b708fd160aaf1c2e71e51f4cd0c4d6b 100644 (file)
--- a/src/common/Mutex.h
+++ b/src/common/Mutex.h
@@ -46,7 +46,7 @@ private:
   PerfCounters *logger;
 
   // don't allow copying.
-  void operator=(Mutex &M);
+  void operator=(const Mutex &M);
   Mutex(const Mutex &M);
 
   void _register() {

diff --git a/src/msg/Connection.h b/src/msg/Connection.h
index fb99e773500f22941e6122a6c08f907b826156fa..493912fc8e64d15986eba01afb03e0aa8742045f 100644 (file)
--- a/src/msg/Connection.h
+++ b/src/msg/Connection.h
@@ -94,7 +94,7 @@ public:
 
   virtual bool is_connected() = 0;
 
-  Messenger *get_messenger() {
+  Messenger *get_messenger() const {
     return msgr;
   }
 
@@ -145,15 +145,15 @@ public:
   virtual void mark_disposable() = 0;
 
 
-  int get_peer_type() { return peer_type; }
+  int get_peer_type() const { return peer_type; }
   void set_peer_type(int t) { peer_type = t; }
 
-  bool peer_is_mon() { return peer_type == CEPH_ENTITY_TYPE_MON; }
-  bool peer_is_mds() { return peer_type == CEPH_ENTITY_TYPE_MDS; }
-  bool peer_is_osd() { return peer_type == CEPH_ENTITY_TYPE_OSD; }
-  bool peer_is_client() { return peer_type == CEPH_ENTITY_TYPE_CLIENT; }
+  bool peer_is_mon() const { return peer_type == CEPH_ENTITY_TYPE_MON; }
+  bool peer_is_mds() const { return peer_type == CEPH_ENTITY_TYPE_MDS; }
+  bool peer_is_osd() const { return peer_type == CEPH_ENTITY_TYPE_OSD; }
+  bool peer_is_client() const { return peer_type == CEPH_ENTITY_TYPE_CLIENT; }
 
-  const entity_addr_t& get_peer_addr() { return peer_addr; }
+  const entity_addr_t& get_peer_addr() const { return peer_addr; }
   void set_peer_addr(const entity_addr_t& a) { peer_addr = a; }
 
   uint64_t get_features() const { return features; }
@@ -161,7 +161,7 @@ public:
   void set_features(uint64_t f) { features = f; }
   void set_feature(uint64_t f) { features |= f; }
 
-  void post_rx_buffer(ceph_tid_t tid, bufferlist& bl) {
+  void post_rx_buffer(ceph_tid_t tid, const bufferlist& bl) {
     Mutex::Locker l(lock);
     ++rx_buffers_version;
     rx_buffers[tid] = pair<bufferlist,int>(bl, rx_buffers_version);

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index d982763f1c2e56d0fe5b317232df42a188428595..08e0a4a23f636f4699ea10af729239d4c88c293e 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -820,7 +820,7 @@ int pg_pool_t::calc_bits_of(int t)
   int b = 0;
   while (t > 0) {
     t = t >> 1;
-    b++;
+    ++b;
   }
   return b;
 }

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 29cadcd1ea19e87079c3a44e75f366fbe50e0cc4..166cd3c5d6d87e3159801e082de28fa3ecb0f650 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -271,17 +271,15 @@ struct pg_t {
   int32_t m_preferred;
 
   pg_t() : m_pool(0), m_seed(0), m_preferred(-1) {}
-  pg_t(ps_t seed, uint64_t pool, int pref=-1) {
-    m_seed = seed;
-    m_pool = pool;
-    m_preferred = pref;
-  }
+  pg_t(ps_t seed, uint64_t pool, int pref=-1) :
+    m_pool(pool), m_seed(seed), m_preferred(pref) {}
+  pg_t(const ceph_pg& cpg) :
+    m_pool(cpg.pool), m_seed(cpg.ps), m_preferred((__s16)cpg.preferred) {}
 
-  pg_t(const ceph_pg& cpg) {
-    m_pool = cpg.pool;
-    m_seed = cpg.ps;
-    m_preferred = (__s16)cpg.preferred;
+  pg_t(const old_pg_t& opg) {
+    *this = opg.v;
   }
+
   old_pg_t get_old_pg() const {
     old_pg_t o;
     assert(m_pool < 0xffffffffull);
@@ -290,9 +288,6 @@ struct pg_t {
     o.v.preferred = (__s16)m_preferred;
     return o;
   }
-  pg_t(const old_pg_t& opg) {
-    *this = opg.v;
-  }
 
   ps_t ps() const {
     return m_seed;