os/bluestore: remove 'extents' from shard_info

We don't use this field; no need to consume the space
on disk.

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index a97205010223ce0ac0bdadad6b706a5a092d736d..2ca7882085dbd122abc1fb1ba8802442a256793a 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1661,7 +1661,6 @@ bool BlueStore::ExtentMap::update(Onode *o, KeyValueDB::Transaction t,
         }
        assert(p->shard_info->offset == p->offset);
        p->shard_info->bytes = len;
-       p->shard_info->extents = nn;
        t->set(PREFIX_OBJ, p->key, bl);
        p->dirty = false;
       }

diff --git a/src/os/bluestore/bluestore_types.cc b/src/os/bluestore/bluestore_types.cc
index 01630cbc1df87a7e7d2a371a0c7ba47d86e376b2..36bcedbfd7fb622e937d19bc2369ad50ced23c66 100644 (file)
--- a/src/os/bluestore/bluestore_types.cc
+++ b/src/os/bluestore/bluestore_types.cc
@@ -546,13 +546,12 @@ void bluestore_onode_t::shard_info::dump(Formatter *f) const
 {
   f->dump_unsigned("offset", offset);
   f->dump_unsigned("bytes", bytes);
-  f->dump_unsigned("extents", extents);
 }
 
 ostream& operator<<(ostream& out, const bluestore_onode_t::shard_info& si)
 {
-  return out << std::hex << "0x" << si.offset << "(0x" << si.bytes << " bytes, "
-            << std::dec << si.extents << " extents)";
+  return out << std::hex << "0x" << si.offset << "(0x" << si.bytes << " bytes"
+            << std::dec << ")";
 }
 
 void bluestore_onode_t::dump(Formatter *f) const

diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h
index 2e684791bf511544a965245c271f8390a6d0ad96..20cda85d052893a03f467bb0a0005f3503e4eb9d 100644 (file)
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@ -673,11 +673,9 @@ struct bluestore_onode_t {
   struct shard_info {
     uint32_t offset = 0;  ///< logical offset for start of shard
     uint32_t bytes = 0;   ///< encoded bytes
-    uint32_t extents = 0; ///< extents
     DENC(shard_info, v, p) {
       denc_varint(v.offset, p);
       denc_varint(v.bytes, p);
-      denc_varint(v.extents, p);
     }
     void dump(Formatter *f) const;
   };