emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use persistent-data::bitset to avoid ambiguity

Browse Source
This commit is contained in:
Denys Duchier
2013-11-16 21:42:23 +01:00
parent d2b30b0eac
commit 3a4c06b772
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
caching/cache_check.cc
View File

@@ -254,7 +254,7 @@ namespace {
out << "examining discard bitset" << end_message();
{
nested_output::nest _ = out.push();
bitset discards(tm, sb.discard_root, sb.discard_nr_blocks);
persistent_data::bitset discards(tm, sb.discard_root, sb.discard_nr_blocks);
}
}
}

6
caching/metadata.cc
View File

@@ -79,7 +79,7 @@ metadata::create_metadata(block_manager<>::ptr bm)
// We can't instantiate the hint array yet, since we don't know the
// hint width.
discard_bits_ = bitset::ptr(new bitset(tm_));
discard_bits_ = persistent_data::bitset::ptr(new persistent_data::bitset(tm_));
}
void
@@ -100,8 +100,8 @@ metadata::open_metadata(block_manager<>::ptr bm)
sb_.hint_root, sb_.cache_blocks));
if (sb_.discard_root)
discard_bits_ = bitset::ptr(
new bitset(tm_, sb_.discard_root, sb_.discard_nr_blocks));
discard_bits_ = persistent_data::bitset::ptr(
new persistent_data::bitset(tm_, sb_.discard_root, sb_.discard_nr_blocks));
}
void

2
caching/metadata.h
View File

@@ -38,7 +38,7 @@ namespace caching {
checked_space_map::ptr metadata_sm_;
mapping_array::ptr mappings_;
hint_array::ptr hints_;
bitset::ptr discard_bits_;
persistent_data::bitset::ptr discard_bits_;
private:
void init_superblock();