Merge branch 'mds_mdstable_addConstToMemFun' of git://github.com/stio…

…paa1/ceph into greg-fs-testing

#10846

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

src/mds/MDSTable.cc

@@ -130,7 +130,7 @@ class C_IO_MT_Load : public MDSTableIOContext {
   }
 };
 
-object_t MDSTable::get_object_name()
+object_t MDSTable::get_object_name() const
 {
   char n[50];
   if (per_mds)

src/mds/MDSTable.h

@@ -31,7 +31,7 @@ class MDSTable {
   bool per_mds;
   mds_rank_t rank;
 
-  object_t get_object_name();
+  object_t get_object_name() const;
 
   static const int STATE_UNDEF   = 0;
   static const int STATE_OPENING = 1;
@@ -55,10 +55,10 @@ class MDSTable {
     rank = r;
   }
 
-  version_t get_version() { return version; }
-  version_t get_committed_version() { return committed_version; }
-  version_t get_committing_version() { return committing_version; }
-  version_t get_projected_version() { return projected_version; }
+  version_t get_version() const { return version; }
+  version_t get_committed_version() const { return committed_version; }
+  version_t get_committing_version() const { return committing_version; }
+  version_t get_projected_version() const { return projected_version; }
 
   void force_replay_version(version_t v) {
     version = projected_version = v;
@@ -68,9 +68,9 @@ class MDSTable {
   //version_t inc_version() { return ++version; }
 
   // load/save from disk (hack)
-  bool is_undef() { return state == STATE_UNDEF; }
-  bool is_active() { return state == STATE_ACTIVE; }
-  bool is_opening() { return state == STATE_OPENING; }
+  bool is_undef() const { return state == STATE_UNDEF; }
+  bool is_active() const { return state == STATE_ACTIVE; }
+  bool is_opening() const { return state == STATE_OPENING; }
 
   void reset();
   void save(MDSInternalContextBase *onfinish=0, version_t need=0);