From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Jul 2015 16:25:59 +0000 (-0400)
Subject: osd/ReplicatedPG: drop old hobject_t encoding compatibility
X-Git-Tag: v9.1.0~346^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51a02db31387a1eb04cb318a6552d7aea0112bd2;p=ceph.git

osd/ReplicatedPG: drop old hobject_t encoding compatibility

This was introduced in 0.47 ... we don't need it any more!

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index dc27c62faf45..8fcecd5af9f2 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2587,19 +2587,6 @@ void ReplicatedPG::do_scan(
       bufferlist::iterator p = m->get_data().begin();
       ::decode(bi.objects, p);
 
-      // handle hobject_t encoding change
-      if (bi.objects.size() && bi.objects.begin()->first.pool == -1) {
-	map<hobject_t, eversion_t, hobject_t::BitwiseComparator> tmp;
-	tmp.swap(bi.objects);
-	for (map<hobject_t, eversion_t, hobject_t::BitwiseComparator>::iterator i = tmp.begin();
-	     i != tmp.end();
-	     ++i) {
-	  hobject_t first(i->first);
-	  if (!first.is_max() && first.pool == -1)
-	    first.pool = info.pgid.pool();
-	  bi.objects[first] = i->second;
-	}
-      }
       peer_backfill_info[from] = bi;
 
       if (waiting_on_backfill.erase(from)) {