]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: use typedef for blob unused (uint16_t) 14316/head
authorSage Weil <sage@redhat.com>
Wed, 5 Apr 2017 14:13:46 +0000 (10:13 -0400)
committerSage Weil <sage@redhat.com>
Wed, 5 Apr 2017 14:18:17 +0000 (10:18 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/os/bluestore/BlueStore.cc
src/os/bluestore/bluestore_types.h

index b6a4cd49390ed7fc6a150167d86242b5d9a71822..a14b6bebe3b0f832280d0b9396df7f26a7e6bff5 100644 (file)
@@ -5173,7 +5173,7 @@ int BlueStore::fsck(bool deep)
        }
       }
       // lextents
-      map<BlobRef,uint16_t> referenced;
+      map<BlobRef,bluestore_blob_t::unused_t> referenced;
       uint64_t pos = 0;
       map<BlobRef, bluestore_blob_use_tracker_t> ref_map;
       for (auto& l : o->extent_map.extent_map) {
@@ -5209,7 +5209,7 @@ int BlueStore::fsck(bool deep)
        ++num_extents;
        if (blob.has_unused()) {
          auto p = referenced.find(l.blob);
-         uint16_t *pu;
+         bluestore_blob_t::unused_t *pu;
          if (p == referenced.end()) {
            pu = &referenced[l.blob];
          } else {
index e5b62568318e63c148d94edcbfa1bbdf18f4daa4..b62a32eea67495615b3c8b97604e9b37df84ca85 100644 (file)
@@ -494,7 +494,8 @@ public:
 
   uint32_t flags = 0;                 ///< FLAG_*
 
-  uint16_t unused = 0;     ///< portion that has never been written to (bitmap)
+  typedef uint16_t unused_t;
+  unused_t unused = 0;     ///< portion that has never been written to (bitmap)
 
   uint8_t csum_type = Checksummer::CSUM_NONE;      ///< CSUM_*
   uint8_t csum_chunk_order = 0;       ///< csum block size is 1<<block_order bytes