From: Sage Weil <sage@redhat.com>
Date: Tue, 11 Oct 2016 22:36:32 +0000 (-0400)
Subject: os/bluestore: remove dead code from reshard()
X-Git-Tag: v11.1.0~655^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1906ac9bcf2eb9111f75e0b27fd34fc1aee26c22;p=ceph.git

os/bluestore: remove dead code from reshard()

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 1090f7a10717f..57c6fbbd3a42a 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1569,9 +1569,6 @@ void BlueStore::ExtentMap::reshard(Onode *o, uint64_t min_alloc_size)
 	   << " target " << target << " slop " << slop << dendl;
 
   // reshard
-  auto sp = o->onode.extent_map_shards.begin();
-  auto esp = o->onode.extent_map_shards.end();
-  unsigned shard_end = 0;
   unsigned estimate = 0;
   unsigned offset = 0;
   vector<bluestore_onode_t::shard_info> new_shard_info;
@@ -1579,23 +1576,6 @@ void BlueStore::ExtentMap::reshard(Onode *o, uint64_t min_alloc_size)
   for (auto& e: extent_map) {
     dout(30) << " extent " << e << dendl;
     assert(!e.blob->is_spanning());
-    if (shard_end == 0 || e.logical_offset >= shard_end) {
-      if (sp == esp) {
-	// inline case
-	shard_end = o->onode.size;
-      } else {
-	auto next = sp;
-	++next;
-	if (next == esp) {
-	  shard_end = o->onode.size;
-	} else {
-	  shard_end = next->offset;
-	}
-	sp = next;
-      }
-      dout(20) << __func__ << " old shard end 0x" << std::hex << shard_end
-	       << std::dec << dendl;
-    }
     // disfavor shard boundaries that span a blob
     bool would_span = (e.logical_offset < max_blob_end) || e.blob_offset;
     if (estimate &&