From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Oct 2016 14:33:59 +0000 (-0500)
Subject: Merge pull request #11328 from liewegas/wip-bluestore-more-types
X-Git-Tag: v11.0.1~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5c615be1c55a3c852e5063beb0fbfa5f63bda9e7;p=ceph.git

Merge pull request #11328 from liewegas/wip-bluestore-more-types

os/bluestore: pack a few more in-memory types
---

5c615be1c55a3c852e5063beb0fbfa5f63bda9e7
diff --cc src/os/bluestore/BlueStore.h
index f0ac8c18bca6,ca9035b0a87b..06e1d1de328a
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@@ -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.