Merge pull request #14819 from tchaikov/wip-objecter-more-constness

osdc/Objecter: more constness Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Apr 27, 2017 · 16e22eb · 16e22eb
2 parents a00005c + d989151
commit 16e22eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
@@ -1396,7 +1396,7 @@ void Objecter::C_Op_Map_Latest::finish(int r)
 }
 
 int Objecter::pool_snap_by_name(int64_t poolid, const char *snap_name,
-				snapid_t *snap)
+				snapid_t *snap) const
 {
   shared_lock rl(rwlock);
 
@@ -1418,7 +1418,7 @@ int Objecter::pool_snap_by_name(int64_t poolid, const char *snap_name,
 }
 
 int Objecter::pool_snap_get_info(int64_t poolid, snapid_t snap,
-				 pool_snap_info_t *info)
+				 pool_snap_info_t *info) const
 {
   shared_lock rl(rwlock);
 

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
@@ -2060,9 +2060,11 @@ class Objecter : public md_config_obs_t, public Dispatcher {
   void handle_osd_map(class MOSDMap *m);
   void wait_for_osd_map();
 
-  int pool_snap_by_name(int64_t poolid, const char *snap_name, snapid_t *snap);
+  int pool_snap_by_name(int64_t poolid,
+			const char *snap_name,
+			snapid_t *snap) const;
   int pool_snap_get_info(int64_t poolid, snapid_t snap,
-			 pool_snap_info_t *info);
+			 pool_snap_info_t *info) const;
   int pool_snap_list(int64_t poolid, vector<uint64_t> *snaps);
 private: