X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fcls%2Frbd%2Fcls_rbd_types.cc;h=6428f1f5d5b424595d46efd15963b4c0ec479894;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=81b12a0fc0b1d290bdf0891ce081f2a494526a41;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/cls/rbd/cls_rbd_types.cc b/ceph/src/cls/rbd/cls_rbd_types.cc
index 81b12a0fc..6428f1f5d 100644
--- a/ceph/src/cls/rbd/cls_rbd_types.cc
+++ b/ceph/src/cls/rbd/cls_rbd_types.cc
@@ -317,24 +317,6 @@ bool GroupSpec::is_valid() const {
   return (!group_id.empty()) && (pool_id != -1);
 }
 
-void GroupSnapshotNamespace::encode(bufferlist& bl) const {
-  ::encode(group_pool, bl);
-  ::encode(group_id, bl);
-  ::encode(snapshot_id, bl);
-}
-
-void GroupSnapshotNamespace::decode(bufferlist::iterator& it) {
-  ::decode(group_pool, it);
-  ::decode(group_id, it);
-  ::decode(snapshot_id, it);
-}
-
-void GroupSnapshotNamespace::dump(Formatter *f) const {
-  f->dump_int("group_pool", group_pool);
-  f->dump_string("group_id", group_id);
-  f->dump_int("snapshot_id", snapshot_id);
-}
-
 class EncodeSnapshotNamespaceVisitor : public boost::static_visitor<void> {
 public:
   explicit EncodeSnapshotNamespaceVisitor(bufferlist &bl) : m_bl(bl) {
@@ -409,9 +391,6 @@ void SnapshotNamespaceOnDisk::decode(bufferlist::iterator &p)
     case cls::rbd::SNAPSHOT_NAMESPACE_TYPE_USER:
       snapshot_namespace = UserSnapshotNamespace();
       break;
-    case cls::rbd::SNAPSHOT_NAMESPACE_TYPE_GROUP:
-      snapshot_namespace = GroupSnapshotNamespace();
-      break;
     default:
       snapshot_namespace = UnknownSnapshotNamespace();
       break;
@@ -426,8 +405,6 @@ void SnapshotNamespaceOnDisk::dump(Formatter *f) const {
 
 void SnapshotNamespaceOnDisk::generate_test_instances(std::list<SnapshotNamespaceOnDisk *> &o) {
   o.push_back(new SnapshotNamespaceOnDisk(UserSnapshotNamespace()));
-  o.push_back(new SnapshotNamespaceOnDisk(GroupSnapshotNamespace(0, "10152ae8944a", 1)));
-  o.push_back(new SnapshotNamespaceOnDisk(GroupSnapshotNamespace(5, "1018643c9869", 3)));
 }
 
 std::ostream& operator<<(std::ostream& os, const UserSnapshotNamespace& ns) {
@@ -435,14 +412,6 @@ std::ostream& operator<<(std::ostream& os, const UserSnapshotNamespace& ns) {
   return os;
 }
 
-std::ostream& operator<<(std::ostream& os, const GroupSnapshotNamespace& ns) {
-  os << "[group"
-     << " group_pool=" << ns.group_pool
-     << " group_id=" << ns.group_id
-     << " snapshot_id=" << ns.snapshot_id << "]";
-  return os;
-}
-
 std::ostream& operator<<(std::ostream& os, const UnknownSnapshotNamespace& ns) {
   os << "[unknown]";
   return os;