]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11328 from liewegas/wip-bluestore-more-types
authorSage Weil <sage@redhat.com>
Thu, 6 Oct 2016 14:33:59 +0000 (09:33 -0500)
committerGitHub <noreply@github.com>
Thu, 6 Oct 2016 14:33:59 +0000 (09:33 -0500)
os/bluestore: pack a few more in-memory types

1  2 
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/test/objectstore/test_bluestore_types.cc

Simple merge
index f0ac8c18bca6b6a86d974424d3e97b914a6efbdd,ca9035b0a87b77be4a818d08189f2dc3177b631a..06e1d1de328a2fc4f62b54495e3ace9d3771c45b
@@@ -407,9 -404,10 +406,10 @@@ public
    };
  
    /// in-memory blob metadata and associated cached buffers (if any)
 -  struct Blob : public boost::intrusive::set_base_hook<> {
 +  struct Blob {
      std::atomic_int nref = {0};     ///< reference count
-     int id = -1;                    ///< id, for spanning blobs only, >= 0
+     int16_t id = -1;                ///< id, for spanning blobs only, >= 0
+     int16_t last_encoded_id = -1;   ///< (ephemeral) used during encoding only
      SharedBlobRef shared_blob;      ///< shared blob state (if any)
  
      /// refs from this shard.  ephemeral if id<0, persisted if spanning.