update ceph source to reef 18.1.2

[ceph.git] / ceph / src / osd / osd_internal_types.h

diff --git a/ceph/src/osd/osd_internal_types.h b/ceph/src/osd/osd_internal_types.h
index 80ecb67a8892f281d186253edc68e5bd0e94c2a9..71240013d614cefc27b2efbb84e8bb85c97a2cf2 100644 (file)
--- a/ceph/src/osd/osd_internal_types.h
+++ b/ceph/src/osd/osd_internal_types.h
@@ -25,6 +25,14 @@ struct SnapSetContext {
   explicit SnapSetContext(const hobject_t& o) :
     oid(o), ref(0), registered(false), exists(true) { }
 };
+
+inline std::ostream& operator<<(std::ostream& out, const SnapSetContext& ssc)
+{
+  return out << "ssc(" << ssc.oid << " snapset: " << ssc.snapset
+             << " ref: " << ssc.ref << " registered: "
+             << ssc.registered << " exists: " << ssc.exists << ")";
+}
+
 struct ObjectContext;
 typedef std::shared_ptr<ObjectContext> ObjectContextRef;
 
@@ -180,9 +188,8 @@ public:
   }
 
   /// in-progress copyfrom ops for this object
-  bool blocked:1;
-  bool requeue_scrub_on_unblock:1;    // true if we need to requeue scrub on unblock
-
+  bool blocked;
+  bool requeue_scrub_on_unblock;    // true if we need to requeue scrub on unblock
 };
 
 inline std::ostream& operator<<(std::ostream& out, const ObjectState& obs)