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 150ba87af8afe24d29c3fd33e46c0957f9296985..972d0993193f1c8c708923e0cfbde0ce0daeb103 100644 (file)
--- 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;
   }