update sources to 12.2.8

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

diff --git a/ceph/src/osd/osd_types.h b/ceph/src/osd/osd_types.h
index ec268b118c6fcc1261a372648d511817ec89211a..254e7b4264f49406a7213cf620c10720c86d2049 100644 (file)
--- a/ceph/src/osd/osd_types.h
+++ b/ceph/src/osd/osd_types.h
@@ -957,9 +957,9 @@ inline bool operator!=(const osd_stat_t& l, const osd_stat_t& r) {
 
 
 inline ostream& operator<<(ostream& out, const osd_stat_t& s) {
-  return out << "osd_stat(" << kb_t(s.kb_used) << " used, "
-            << kb_t(s.kb_avail) << " avail, "
-            << kb_t(s.kb) << " total, "
+  return out << "osd_stat(" << byte_u_t(s.kb_used << 10) << " used, "
+            << byte_u_t(s.kb_avail << 10) << " avail, "
+            << byte_u_t(s.kb << 10) << " total, "
             << "peers " << s.hb_peers
             << " op hist " << s.op_queue_age_hist.h
             << ")";
@@ -4966,6 +4966,7 @@ struct ScrubMap {
   eversion_t valid_through;
   eversion_t incr_since;
   bool has_large_omap_object_errors:1;
+  boost::optional<bool> has_builtin_csum;
 
   void merge_incr(const ScrubMap &l);
   void clear_from(const hobject_t& start) {