From: Samuel Just <sjust@redhat.com>
Date: Sat, 1 Jul 2023 21:06:17 +0000 (+0000)
Subject: common/scrub_types.h: add inconsistent_obj_wrapper::merge
X-Git-Tag: v19.3.0~296^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20d15d4bd2130439c59071c9b84c907b988a8a37;p=ceph.git

common/scrub_types.h: add inconsistent_obj_wrapper::merge

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/common/scrub_types.h b/src/common/scrub_types.h
index 150ba87af8a..972d0993193 100644
--- a/src/common/scrub_types.h
+++ b/src/common/scrub_types.h
@@ -113,6 +113,10 @@ namespace librados {
 struct inconsistent_obj_wrapper : librados::inconsistent_obj_t {
   explicit inconsistent_obj_wrapper(const hobject_t& hoid);
 
+  void merge(obj_err_t other) {
+    errors |= other.errors;
+  }
+
   void set_object_info_inconsistency() {
     errors |= obj_err_t::OBJECT_INFO_INCONSISTENCY;
   }