os/bluestore/bluestore_types: drop num_refs from blob_t

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/os/bluestore/bluestore_types.cc b/src/os/bluestore/bluestore_types.cc
index ae15f97dcc656f515985a9b5750ce2732358275c..3a193c1d1158ca768ddbee46ad1f0415cb1514e6 100644 (file)
--- a/src/os/bluestore/bluestore_types.cc
+++ b/src/os/bluestore/bluestore_types.cc
@@ -426,7 +426,6 @@ void bluestore_blob_t::encode(bufferlist& bl) const
   ::encode(flags, bl);
   ::encode(csum_type, bl);
   ::encode(csum_block_order, bl);
-  ::encode(num_refs, bl);
   ::encode(ref_map, bl);
   ::encode(csum_data, bl);
   ENCODE_FINISH(bl);
@@ -440,7 +439,6 @@ void bluestore_blob_t::decode(bufferlist::iterator& p)
   ::decode(flags, p);
   ::decode(csum_type, p);
   ::decode(csum_block_order, p);
-  ::decode(num_refs, p);
   ::decode(ref_map, p);
   ::decode(csum_data, p);
   DECODE_FINISH(p);
@@ -457,7 +455,6 @@ void bluestore_blob_t::dump(Formatter *f) const
   f->dump_unsigned("flags", flags);
   f->dump_unsigned("csum_type", csum_type);
   f->dump_unsigned("csum_block_order", csum_block_order);
-  f->dump_unsigned("num_refs", num_refs);
   f->dump_object("ref_map", ref_map);
   f->open_array_section("csum_data");
   size_t n = get_csum_count();
@@ -475,14 +472,12 @@ void bluestore_blob_t::generate_test_instances(list<bluestore_blob_t*>& ls)
   ls.back()->csum_type = CSUM_XXHASH32;
   ls.back()->csum_block_order = 16;
   ls.back()->csum_data = vector<char>{1, 2, 3, 4};  // one uint32_t
-  ls.back()->num_refs = 3;
 }
 
 ostream& operator<<(ostream& out, const bluestore_blob_t& o)
 {
   out << "blob(" << o.extents
-      << " len 0x" << std::hex << o.length << std::dec
-      << " nref " << o.num_refs;
+      << " len 0x" << std::hex << o.length << std::dec;
   if (o.flags) {
     out << " " << o.get_flags_string();
   }
@@ -491,7 +486,7 @@ ostream& operator<<(ostream& out, const bluestore_blob_t& o)
        << " order " << (int)o.csum_block_order;
   }
   if (!o.ref_map.empty()) {
-    out << " ref_map " << o.ref_map;
+    out << " " << o.ref_map;
   }
   out << ")";
   return out;

diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h
index 7968d161b99738f3beb1f4007ee60f9ab636744f..69db57e751f07a6781e2a10e51692d76dfc582d7 100644 (file)
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@ -238,7 +238,6 @@ struct bluestore_blob_t {
   uint8_t csum_type;               ///< CSUM_*
   uint8_t csum_block_order;        ///< csum block size is 1<<block_order bytes
 
-  uint32_t num_refs;               ///< num lextents that point to me
   bluestore_extent_ref_map_t ref_map; ///< references (empty when in onode)
   vector<char> csum_data;          ///< opaque vector of csum data
 
@@ -246,16 +245,14 @@ struct bluestore_blob_t {
     : length(l),
       flags(f),
       csum_type(CSUM_NONE),
-      csum_block_order(12),
-      num_refs(1) {
+      csum_block_order(12) {
   }
 
   bluestore_blob_t(uint32_t l, const bluestore_pextent_t& ext, uint32_t f = 0)
     : length(l),
       flags(f),
       csum_type(CSUM_NONE),
-      csum_block_order(12),
-      num_refs(1) {
+      csum_block_order(12) {
     extents.push_back(ext);
   }