import 15.2.2 octopus source

[ceph.git] / ceph / src / cls / rbd / cls_rbd_types.h

diff --git a/ceph/src/cls/rbd/cls_rbd_types.h b/ceph/src/cls/rbd/cls_rbd_types.h
index b2c155eb864a2378101b2e27addd94c742efce73..5ea37caf7d45ceaa93dd3b3b974fc7d84e9d7dde 100644 (file)
--- a/ceph/src/cls/rbd/cls_rbd_types.h
+++ b/ceph/src/cls/rbd/cls_rbd_types.h
@@ -545,7 +545,10 @@ struct MirrorSnapshotNamespace {
   std::set<std::string> mirror_peer_uuids;
 
   std::string primary_mirror_uuid;
-  snapid_t primary_snap_id = CEPH_NOSNAP;
+  union {
+    snapid_t primary_snap_id = CEPH_NOSNAP;
+    snapid_t clean_since_snap_id;
+  };
   uint64_t last_copied_object_number = 0;
   SnapSeqs snap_seqs;