update sources to ceph Nautilus 14.2.1

[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 dd8e801aa8ba02cb20ed83e2030ddf972c93daf7..d0385138bbdba26f0d7ba08911f242a93085b2db 100644 (file)
--- a/ceph/src/common/scrub_types.cc
+++ b/ceph/src/common/scrub_types.cc
@@ -5,49 +5,50 @@ using namespace librados;
 void object_id_wrapper::encode(bufferlist& bl) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(name, bl);
-  ::encode(nspace, bl);
-  ::encode(locator, bl);
-  ::encode(snap, bl);
+  encode(name, bl);
+  encode(nspace, bl);
+  encode(locator, bl);
+  encode(snap, bl);
   ENCODE_FINISH(bl);
 }
 
-void object_id_wrapper::decode(bufferlist::iterator& bp)
+void object_id_wrapper::decode(bufferlist::const_iterator& bp)
 {
   DECODE_START(1, bp);
-  ::decode(name, bp);
-  ::decode(nspace, bp);
-  ::decode(locator, bp);
-  ::decode(snap, bp);
+  decode(name, bp);
+  decode(nspace, bp);
+  decode(locator, bp);
+  decode(snap, bp);
   DECODE_FINISH(bp);
 }
 
+namespace librados {
 static void encode(const object_id_t& obj, bufferlist& bl)
 {
   reinterpret_cast<const object_id_wrapper&>(obj).encode(bl);
 }
+}
 
 void osd_shard_wrapper::encode(bufferlist& bl) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(osd, bl);
-  ::encode(shard, bl);
+  encode(osd, bl);
+  encode(shard, bl);
   ENCODE_FINISH(bl);
 }
 
-void osd_shard_wrapper::decode(bufferlist::iterator& bp)
+void osd_shard_wrapper::decode(bufferlist::const_iterator& bp)
 {
   DECODE_START(1, bp);
-  ::decode(osd, bp);
-  ::decode(shard, bp);
+  decode(osd, bp);
+  decode(shard, bp);
   DECODE_FINISH(bp);
 }
 
 namespace librados {
-  static void encode(const osd_shard_t& shard, bufferlist& bl)
-  {
-    reinterpret_cast<const osd_shard_wrapper&>(shard).encode(bl);
-  }
+static void encode(const osd_shard_t& shard, bufferlist& bl) {
+  reinterpret_cast<const osd_shard_wrapper&>(shard).encode(bl);
+}
 }
 
 void shard_info_wrapper::set_object(const ScrubMap::object& object)
@@ -71,36 +72,34 @@ void shard_info_wrapper::set_object(const ScrubMap::object& object)
 void shard_info_wrapper::encode(bufferlist& bl) const
 {
   ENCODE_START(3, 3, bl);
-  ::encode(errors, bl);
-  ::encode(primary, bl);
-  if (has_shard_missing()) {
-    return;
+  encode(errors, bl);
+  encode(primary, bl);
+  if (!has_shard_missing()) {
+    encode(attrs, bl);
+    encode(size, bl);
+    encode(omap_digest_present, bl);
+    encode(omap_digest, bl);
+    encode(data_digest_present, bl);
+    encode(data_digest, bl);
+    encode(selected_oi, bl);
   }
-  ::encode(attrs, bl);
-  ::encode(size, bl);
-  ::encode(omap_digest_present, bl);
-  ::encode(omap_digest, bl);
-  ::encode(data_digest_present, bl);
-  ::encode(data_digest, bl);
-  ::encode(selected_oi, bl);
   ENCODE_FINISH(bl);
 }
 
-void shard_info_wrapper::decode(bufferlist::iterator& bp)
+void shard_info_wrapper::decode(bufferlist::const_iterator& bp)
 {
   DECODE_START(3, bp);
-  ::decode(errors, bp);
-  ::decode(primary, bp);
-  if (has_shard_missing()) {
-    return;
+  decode(errors, bp);
+  decode(primary, bp);
+  if (!has_shard_missing()) {
+    decode(attrs, bp);
+    decode(size, bp);
+    decode(omap_digest_present, bp);
+    decode(omap_digest, bp);
+    decode(data_digest_present, bp);
+    decode(data_digest, bp);
+    decode(selected_oi, bp);
   }
-  ::decode(attrs, bp);
-  ::decode(size, bp);
-  ::decode(omap_digest_present, bp);
-  ::decode(omap_digest, bp);
-  ::decode(data_digest_present, bp);
-  ::decode(data_digest, bp);
-  ::decode(selected_oi, bp);
   DECODE_FINISH(bp);
 }
 
@@ -150,23 +149,23 @@ namespace librados {
 void inconsistent_obj_wrapper::encode(bufferlist& bl) const
 {
   ENCODE_START(2, 2, bl);
-  ::encode(errors, bl);
-  ::encode(object, bl);
-  ::encode(version, bl);
-  ::encode(shards, bl);
-  ::encode(union_shards.errors, bl);
+  encode(errors, bl);
+  encode(object, bl);
+  encode(version, bl);
+  encode(shards, bl);
+  encode(union_shards.errors, bl);
   ENCODE_FINISH(bl);
 }
 
-void inconsistent_obj_wrapper::decode(bufferlist::iterator& bp)
+void inconsistent_obj_wrapper::decode(bufferlist::const_iterator& bp)
 {
   DECODE_START(2, bp);
   DECODE_OLDEST(2);
-  ::decode(errors, bp);
-  ::decode(object, bp);
-  ::decode(version, bp);
-  ::decode(shards, bp);
-  ::decode(union_shards.errors, bp);
+  decode(errors, bp);
+  decode(object, bp);
+  decode(version, bp);
+  decode(shards, bp);
+  decode(union_shards.errors, bp);
   DECODE_FINISH(bp);
 }
 
@@ -221,11 +220,6 @@ void inconsistent_snapset_wrapper::set_snapset_error()
   errors |= inc_snapset_t::SNAP_ERROR;
 }
 
-void inconsistent_snapset_wrapper::set_head_mismatch()
-{
-  errors |= inc_snapset_t::HEAD_MISMATCH;
-}
-
 void inconsistent_snapset_wrapper::set_size_mismatch()
 {
   errors |= inc_snapset_t::SIZE_MISMATCH;
@@ -234,23 +228,23 @@ void inconsistent_snapset_wrapper::set_size_mismatch()
 void inconsistent_snapset_wrapper::encode(bufferlist& bl) const
 {
   ENCODE_START(2, 1, bl);
-  ::encode(errors, bl);
-  ::encode(object, bl);
-  ::encode(clones, bl);
-  ::encode(missing, bl);
-  ::encode(ss_bl, 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)
+void inconsistent_snapset_wrapper::decode(bufferlist::const_iterator& bp)
 {
   DECODE_START(2, bp);
-  ::decode(errors, bp);
-  ::decode(object, bp);
-  ::decode(clones, bp);
-  ::decode(missing, bp);
+  decode(errors, bp);
+  decode(object, bp);
+  decode(clones, bp);
+  decode(missing, bp);
   if (struct_v >= 2) {
-    ::decode(ss_bl, bp);
+    decode(ss_bl, bp);
   }
   DECODE_FINISH(bp);
 }
@@ -258,39 +252,39 @@ void inconsistent_snapset_wrapper::decode(bufferlist::iterator& bp)
 void scrub_ls_arg_t::encode(bufferlist& bl) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(interval, bl);
-  ::encode(get_snapsets, bl);
-  ::encode(start_after.name, bl);
-  ::encode(start_after.nspace, bl);
-  ::encode(start_after.snap, bl);
-  ::encode(max_return, bl);
+  encode(interval, bl);
+  encode(get_snapsets, bl);
+  encode(start_after.name, bl);
+  encode(start_after.nspace, bl);
+  encode(start_after.snap, bl);
+  encode(max_return, bl);
   ENCODE_FINISH(bl);
 }
 
-void scrub_ls_arg_t::decode(bufferlist::iterator& bp)
+void scrub_ls_arg_t::decode(bufferlist::const_iterator& bp)
 {
   DECODE_START(1, bp);
-  ::decode(interval, bp);
-  ::decode(get_snapsets, bp);
-  ::decode(start_after.name, bp);
-  ::decode(start_after.nspace, bp);
-  ::decode(start_after.snap, bp);
-  ::decode(max_return, bp);
+  decode(interval, bp);
+  decode(get_snapsets, bp);
+  decode(start_after.name, bp);
+  decode(start_after.nspace, bp);
+  decode(start_after.snap, bp);
+  decode(max_return, bp);
   DECODE_FINISH(bp);
 }
 
 void scrub_ls_result_t::encode(bufferlist& bl) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(interval, bl);
-  ::encode(vals, bl);
+  encode(interval, bl);
+  encode(vals, bl);
   ENCODE_FINISH(bl);
 }
 
-void scrub_ls_result_t::decode(bufferlist::iterator& bp)
+void scrub_ls_result_t::decode(bufferlist::const_iterator& bp)
 {
   DECODE_START(1, bp);
-  ::decode(interval, bp);
-  ::decode(vals, bp);
+  decode(interval, bp);
+  decode(vals, bp);
   DECODE_FINISH(bp);
 }