From 703213b1f09155ec6cf6e2b3f4779b5bbb0872d6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 5 Apr 2017 10:13:46 -0400 Subject: [PATCH] os/bluestore: use typedef for blob unused (uint16_t) Signed-off-by: Sage Weil --- src/os/bluestore/BlueStore.cc | 4 ++-- src/os/bluestore/bluestore_types.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index b6a4cd49390e..a14b6bebe3b0 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5173,7 +5173,7 @@ int BlueStore::fsck(bool deep) } } // lextents - map referenced; + map referenced; uint64_t pos = 0; map 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 { diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h index e5b62568318e..b62a32eea674 100644 --- a/src/os/bluestore/bluestore_types.h +++ b/src/os/bluestore/bluestore_types.h @@ -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<