From: Ronen Friedman <rfriedma@redhat.com>
Date: Tue, 16 Aug 2022 14:25:48 +0000 (+0300)
Subject: osd: fix ScrubMap::swap() to include all ScrubMap data members
X-Git-Tag: v18.0.0~218^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=792e93607c526d0f374d1e0517859c09def5dd4e;p=ceph-ci.git

osd: fix ScrubMap::swap() to include all ScrubMap data members

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index acf5875a32e..a10c787257c 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -6070,6 +6070,8 @@ std::ostream& operator<<(std::ostream& out, const PushOp &op);
 
 /*
  * summarize pg contents for purposes of a scrub
+ *
+ * If members are added to ScrubMap, make sure to modify swap().
  */
 struct ScrubMap {
   struct object {
@@ -6122,6 +6124,8 @@ struct ScrubMap {
     swap(objects, r.objects);
     swap(valid_through, r.valid_through);
     swap(incr_since, r.incr_since);
+    swap(has_large_omap_object_errors, r.has_large_omap_object_errors);
+    swap(has_omap_keys, r.has_omap_keys);
   }
 
   void encode(ceph::buffer::list& bl) const;