osdc/ObjectCacher: change iterator to const_iter

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

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 93b2412de53a1731ec7be474bca0eecc14b636bf..4a53e26ccdf9a8af1b719e3217795e917d6d54e1 100644 (file)
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -171,7 +171,7 @@ void ObjectCacher::Object::try_merge_bh(BufferHead *bh)
 bool ObjectCacher::Object::is_cached(loff_t cur, loff_t left)
 {
   assert(oc->lock.is_locked());
-  map<loff_t, BufferHead*>::iterator p = data_lower_bound(cur);
+  map<loff_t, BufferHead*>::const_iterator p = data_lower_bound(cur);
   while (left > 0) {
     if (p == data.end())
       return false;
@@ -227,7 +227,7 @@ int ObjectCacher::Object::map_read(ObjectExtent &ex,
   loff_t cur = ex.offset;
   loff_t left = ex.length;
 
-  map<loff_t, BufferHead*>::iterator p = data_lower_bound(ex.offset);
+  map<loff_t, BufferHead*>::const_iterator p = data_lower_bound(ex.offset);
   while (left > 0) {
     // at end?
     if (p == data.end()) {
@@ -353,7 +353,7 @@ ObjectCacher::BufferHead *ObjectCacher::Object::map_write(ObjectExtent &ex,
   loff_t cur = ex.offset;
   loff_t left = ex.length;
 
-  map<loff_t, BufferHead*>::iterator p = data_lower_bound(ex.offset);
+  map<loff_t, BufferHead*>::const_iterator p = data_lower_bound(ex.offset);
   while (left > 0) {
     loff_t max = left;
 
@@ -510,7 +510,7 @@ void ObjectCacher::Object::discard(loff_t off, loff_t len)
     complete = false;
   }
 
-  map<loff_t, BufferHead*>::iterator p = data_lower_bound(off);
+  map<loff_t, BufferHead*>::const_iterator p = data_lower_bound(off);
   while (p != data.end()) {
     BufferHead *bh = p->second;
     if (bh->start() >= off + len)
@@ -783,7 +783,7 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid,
     // apply to bh's!
     loff_t opos = start;
     while (true) {
-      map<loff_t, BufferHead*>::iterator p = ob->data_lower_bound(opos);
+      map<loff_t, BufferHead*>::const_iterator p = ob->data_lower_bound(opos);
       if (p == ob->data.end())
        break;
       if (opos >= start+(loff_t)length) {
@@ -1063,7 +1063,7 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid,
 
     list <BufferHead*> hit;
     // apply to bh's!
-    for (map<loff_t, BufferHead*>::iterator p = ob->data_lower_bound(start);
+    for (map<loff_t, BufferHead*>::const_iterator p = ob->data_lower_bound(start);
         p != ob->data.end();
         ++p) {
       BufferHead *bh = p->second;
@@ -1906,7 +1906,7 @@ bool ObjectCacher::flush(Object *ob, loff_t offset, loff_t length)
   list<BufferHead*> blist;
   bool clean = true;
   ldout(cct, 10) << "flush " << *ob << " " << offset << "~" << length << dendl;
-  for (map<loff_t,BufferHead*>::iterator p = ob->data_lower_bound(offset);
+  for (map<loff_t,BufferHead*>::const_iterator p = ob->data_lower_bound(offset);
        p != ob->data.end();
        ++p) {
     BufferHead *bh = p->second;
@@ -1969,7 +1969,7 @@ bool ObjectCacher::flush_set(ObjectSet *oset, Context *onfinish)
 
   list<BufferHead*> blist;
   Object *last_ob = NULL;
-  set<BufferHead*, BufferHead::ptr_lt>::iterator it, p, q;
+  set<BufferHead*, BufferHead::ptr_lt>::const_iterator it, p, q;
 
   // Buffer heads in dirty_or_tx_bh are sorted in ObjectSet/Object/offset
   // order. But items in oset->objects are not sorted. So the iterator can

diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h
index d098a31c651b4b094ae3474981f87223c7e3c974..7b5a7a4fbdc887d9d4586ec07200f0ebc241835d 100644 (file)
--- a/src/osdc/ObjectCacher.h
+++ b/src/osdc/ObjectCacher.h
@@ -306,8 +306,8 @@ class ObjectCacher {
      * @param offset object byte offset
      * @return iterator pointing to buffer, or data.end()
      */
-    map<loff_t,BufferHead*>::iterator data_lower_bound(loff_t offset) {
-      map<loff_t,BufferHead*>::iterator p = data.lower_bound(offset);
+    map<loff_t,BufferHead*>::const_iterator data_lower_bound(loff_t offset) const {
+      map<loff_t,BufferHead*>::const_iterator p = data.lower_bound(offset);
       if (p != data.begin() &&
          (p == data.end() || p->first > offset)) {
        --p;     // might overlap!