osd/osd_types: SnapSet: drop is_legacy

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 7f10196aeb61ebdcc8efa4eae1643d962b5956ae..42984d4c7fb81ba6ba10aeb388f38c1175edefac 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4717,18 +4717,8 @@ void SnapSet::generate_test_instances(list<SnapSet*>& o)
 
 ostream& operator<<(ostream& out, const SnapSet& cs)
 {
-  if (cs.is_legacy()) {
-    out << cs.seq << "=" << cs.snaps << ":"
-       << cs.clones
-       << (cs.head_exists ? "+head":"");
-    if (!cs.clone_snaps.empty()) {
-      out << "+stray_clone_snaps=" << cs.clone_snaps;
-    }
-    return out;
-  } else {
-    return out << cs.seq << "=" << cs.snaps << ":"
-              << cs.clone_snaps;
-  }
+  return out << cs.seq << "=" << cs.snaps << ":"
+            << cs.clone_snaps;
 }
 
 void SnapSet::from_snap_set(const librados::snap_set_t& ss, bool legacy)

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 77e85ba8156a9f82ce94276d98d31519885eb7b4..fade0331affc1116b79c94553279f2ef610856e6 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -4458,10 +4458,6 @@ struct SnapSet {
     decode(p);
   }
 
-  bool is_legacy() const {
-    return clone_snaps.size() < clones.size() || !head_exists;
-  }
-
   /// populate SnapSet from a librados::snap_set_t
   void from_snap_set(const librados::snap_set_t& ss, bool legacy);