From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Sep 2017 17:35:32 +0000 (-0400)
Subject: osd/osd_types: SnapSet: drop is_legacy
X-Git-Tag: v13.0.1~840^2~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b5ac17874dcbd65ac17ac123da32346afddc7181;p=ceph-ci.git

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 7f10196aeb6..42984d4c7fb 100644
--- 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 77e85ba8156..fade0331aff 100644
--- 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);