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 dc27c62faf45779aefb3d0d13e7fb01cc50ea52e..8fcecd5af9f2952037b8208fc9082f7ceedbb622 100644 (file)
--- 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)) {