From: Sage Weil <sage@redhat.com>
Date: Thu, 9 Apr 2015 17:52:06 +0000 (-0700)
Subject: os/newstore: use lower_bound for finding overlay extents in map
X-Git-Tag: v9.1.0~242^2~81
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9a7fd4e4c503472866da5597824471bec766f20;p=ceph.git

os/newstore: use lower_bound for finding overlay extents in map

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index 689415c571b27..0fead936b2c25 100644
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -1198,12 +1198,12 @@ int NewStore::_do_read(
 
   // loop over overlays and data fragments.  overlays take precedence.
   fend = o->onode.data_map.end();
-  fp = o->onode.data_map.begin();   // fixme
+  fp = o->onode.data_map.lower_bound(offset);
   if (fp != o->onode.data_map.begin()) {
     --fp;
   }
   oend = o->onode.overlay_map.end();
-  op = o->onode.overlay_map.begin(); // fixme
+  op = o->onode.overlay_map.lower_bound(offset);
   if (op != o->onode.overlay_map.begin()) {
     --op;
   }
@@ -2819,7 +2819,8 @@ int NewStore::_do_overlay_trim(TransContext *txc,
   dout(10) << __func__ << " " << o->oid << " "
 	   << offset << "~" << length << dendl;
 
-  map<uint64_t,overlay_t>::iterator p = o->onode.overlay_map.begin(); // fixme
+  map<uint64_t,overlay_t>::iterator p =
+    o->onode.overlay_map.lower_bound(offset);
   if (p != o->onode.overlay_map.begin()) {
     --p;
   }