osd::Missing: const cleanup

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 3ee1f9d61703ab02705b2741cd58a479be2f401f..c759d21de4541e3d40d3d402648eaa0cd804ff2d 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2930,19 +2930,29 @@ void PG::Missing::swap(Missing& o)
   rmissing.swap(o.rmissing);
 }
 
-bool PG::Missing::is_missing(const sobject_t& oid)
+bool PG::Missing::is_missing(const sobject_t& oid) const
 {
-  return missing.count(oid);
+  return (missing.find(oid) != missing.end());
 }
 
-bool PG::Missing::is_missing(const sobject_t& oid, eversion_t v)
+bool PG::Missing::is_missing(const sobject_t& oid, eversion_t v) const
 {
-  return missing.count(oid) && missing[oid].need <= v;
+  map<sobject_t, item>::const_iterator m = missing.find(oid);
+  if (m == missing.end())
+    return false;
+  const Missing::item &item(m->second);
+  if (item.need > v)
+    return false;
+  return true;
 }
 
-eversion_t PG::Missing::have_old(const sobject_t& oid)
+eversion_t PG::Missing::have_old(const sobject_t& oid) const
 {
-  return missing.count(oid) ? missing[oid].have : eversion_t();
+  map<sobject_t, item>::const_iterator m = missing.find(oid);
+  if (m == missing.end())
+    return eversion_t();
+  const Missing::item &item(m->second);
+  return item.have;
 }
 
 /*

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 19dd9f74bf005ab206a62bdb38e8e320ccd117d0..257185ec9c1603eb3e0e1d0b4fc5169539ba9ad6 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -556,9 +556,9 @@ public:
 
     unsigned int num_missing() const;
     void swap(Missing& o);
-    bool is_missing(const sobject_t& oid);
-    bool is_missing(const sobject_t& oid, eversion_t v);
-    eversion_t have_old(const sobject_t& oid);
+    bool is_missing(const sobject_t& oid) const;
+    bool is_missing(const sobject_t& oid, eversion_t v) const;
+    eversion_t have_old(const sobject_t& oid) const;
     void add_next_event(Log::Entry& e);
     void add_event(Log::Entry& e);
     void revise_need(sobject_t oid, eversion_t need);