update sources to v12.2.5

[ceph.git] / ceph / src / common / scrub_types.cc

diff --git a/ceph/src/common/scrub_types.cc b/ceph/src/common/scrub_types.cc
index abc575d7a0db5fa3d4e1850d69e4a9365c299f5e..dd8e801aa8ba02cb20ed83e2030ddf972c93daf7 100644 (file)
--- a/ceph/src/common/scrub_types.cc
+++ b/ceph/src/common/scrub_types.cc
@@ -184,24 +184,24 @@ void inconsistent_snapset_wrapper::set_headless()
   errors |= inc_snapset_t::HEADLESS_CLONE;
 }
 
-void inconsistent_snapset_wrapper::set_ss_attr_missing()
+void inconsistent_snapset_wrapper::set_snapset_missing()
 {
   errors |= inc_snapset_t::SNAPSET_MISSING;
 }
 
-void inconsistent_snapset_wrapper::set_oi_attr_missing()
+void inconsistent_snapset_wrapper::set_info_missing()
 {
-  errors |= inc_snapset_t::OI_MISSING;
+  errors |= inc_snapset_t::INFO_MISSING;
 }
 
-void inconsistent_snapset_wrapper::set_ss_attr_corrupted()
+void inconsistent_snapset_wrapper::set_snapset_corrupted()
 {
   errors |= inc_snapset_t::SNAPSET_CORRUPTED;
 }
 
-void inconsistent_snapset_wrapper::set_oi_attr_corrupted()
+void inconsistent_snapset_wrapper::set_info_corrupted()
 {
-  errors |= inc_snapset_t::OI_CORRUPTED;
+  errors |= inc_snapset_t::INFO_CORRUPTED;
 }
 
 void inconsistent_snapset_wrapper::set_clone_missing(snapid_t snap)
@@ -216,9 +216,9 @@ void inconsistent_snapset_wrapper::set_clone(snapid_t snap)
   clones.push_back(snap);
 }
 
-void inconsistent_snapset_wrapper::set_snapset_mismatch()
+void inconsistent_snapset_wrapper::set_snapset_error()
 {
-  errors |= inc_snapset_t::SNAP_MISMATCH;
+  errors |= inc_snapset_t::SNAP_ERROR;
 }
 
 void inconsistent_snapset_wrapper::set_head_mismatch()
@@ -233,21 +233,25 @@ void inconsistent_snapset_wrapper::set_size_mismatch()
 
 void inconsistent_snapset_wrapper::encode(bufferlist& bl) const
 {
-  ENCODE_START(1, 1, bl);
+  ENCODE_START(2, 1, bl);
   ::encode(errors, bl);
   ::encode(object, bl);
   ::encode(clones, bl);
   ::encode(missing, bl);
+  ::encode(ss_bl, bl);
   ENCODE_FINISH(bl);
 }
 
 void inconsistent_snapset_wrapper::decode(bufferlist::iterator& bp)
 {
-  DECODE_START(1, bp);
+  DECODE_START(2, bp);
   ::decode(errors, bp);
   ::decode(object, bp);
   ::decode(clones, bp);
   ::decode(missing, bp);
+  if (struct_v >= 2) {
+    ::decode(ss_bl, bp);
+  }
   DECODE_FINISH(bp);
 }