From d334d2d3cb3154586516f84d8b187288ac210d5f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 29 May 2017 16:46:21 -0400 Subject: [PATCH] os/bluestore: fsck: use btree_set to replace set Signed-off-by: Sage Weil --- src/os/bluestore/BlueStore.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 1552b3248e0a1..85e8c3e6b7181 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -17,6 +17,8 @@ #include #include +#include "include/cpp-btree/btree_set.h" + #include "BlueStore.h" #include "os/kv.h" #include "include/compat.h" @@ -5144,10 +5146,15 @@ int BlueStore::fsck(bool deep) { dout(1) << __func__ << (deep ? " (deep)" : " (shallow)") << " start" << dendl; int errors = 0; - mempool::bluestore_fsck::set used_nids; - mempool::bluestore_fsck::set used_omap_head; + + typedef btree::btree_set< + uint64_t,std::less, + mempool::bluestore_fsck::pool_allocator> uint64_t_btree_t; + uint64_t_btree_t used_nids; + uint64_t_btree_t used_omap_head; + uint64_t_btree_t used_sbids; + mempool_dynamic_bitset used_blocks; - mempool::bluestore_fsck::set used_sbids; KeyValueDB::Iterator it; store_statfs_t expected_statfs, actual_statfs; struct sb_info_t { -- 2.39.5