From: Sage Weil <sage@redhat.com>
Date: Fri, 27 Jan 2017 21:46:04 +0000 (-0500)
Subject: os/bluestore: ExtentMap: use normal iterator for reshard loop
X-Git-Tag: v12.0.1~489^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fdccb2d966bd112a6b737c077fd8083fb5d9b18;p=ceph.git

os/bluestore: ExtentMap: use normal iterator for reshard loop

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 6eedbce2b699..a9929acc6d8a 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1896,18 +1896,18 @@ void BlueStore::ExtentMap::reshard(
   unsigned offset = 0;
   vector<bluestore_onode_t::shard_info> new_shard_info;
   unsigned max_blob_end = 0;
-  for (auto& e: extent_map) {
-    dout(30) << " extent " << e << dendl;
+  for (auto e = extent_map.begin(); e != extent_map.end(); ++e) {
+    dout(30) << " extent " << *e << dendl;
 
     // unspan spanning blobs
-    if (e.blob->is_spanning()) {
-      spanning_blob_map.erase(e.blob->id);
-      e.blob->id = -1;
-      dout(30) << __func__ << " un-spanning " << *e.blob << dendl;
+    if (e->blob->is_spanning()) {
+      spanning_blob_map.erase(e->blob->id);
+      e->blob->id = -1;
+      dout(30) << __func__ << " un-spanning " << *e->blob << dendl;
     }
 
     // disfavor shard boundaries that span a blob
-    bool would_span = (e.logical_offset < max_blob_end) || e.blob_offset;
+    bool would_span = (e->logical_offset < max_blob_end) || e->blob_offset;
     if (estimate &&
 	estimate + extent_avg > target + (would_span ? slop : 0)) {
       // new shard
@@ -1917,7 +1917,7 @@ void BlueStore::ExtentMap::reshard(
 	dout(20) << __func__ << "  new shard 0x" << std::hex << offset
 		 << std::dec << dendl;
       }
-      offset = e.logical_offset;
+      offset = e->logical_offset;
       new_shard_info.emplace_back(bluestore_onode_t::shard_info());
       new_shard_info.back().offset = offset;
       dout(20) << __func__ << "  new shard 0x" << std::hex << offset
@@ -1925,7 +1925,7 @@ void BlueStore::ExtentMap::reshard(
       estimate = 0;
     }
     estimate += extent_avg;
-    uint32_t be = e.blob_end();
+    uint32_t be = e->blob_end();
     if (be > max_blob_end) {
       max_blob_end = be;
     }