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

Merge branch 'v0.7-devel' of github.com:jthornber/thin-provisioning-tools into v0.7-devel

Browse Source
This commit is contained in:
Joe Thornber
2016-07-11 15:51:58 +01:00
parent c2fdbad322 ef40277d55
commit 52de2dd38e
9 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
persistent-data/data-structures/btree_counter.h
View File

@@ -37,7 +37,7 @@ namespace persistent_data {
for (unsigned i = 0; i < nr; i++) {
// FIXME: confirm l2 is correct
node_location l2(l);
l2.push_key(i);
l2.push_key(n.key_at(i));
vc_.visit(l2, n.value_at(i));
}

4
persistent-data/space-maps/disk.cc
View File

@@ -742,7 +742,7 @@ persistent_data::create_disk_sm(transaction_manager &tm,
}
checked_space_map::ptr
persistent_data::open_disk_sm(transaction_manager &tm, void *root)
persistent_data::open_disk_sm(transaction_manager &tm, void const *root)
{
sm_root_disk d;
sm_root v;
@@ -770,7 +770,7 @@ persistent_data::create_metadata_sm(transaction_manager &tm, block_address nr_bl
}
checked_space_map::ptr
persistent_data::open_metadata_sm(transaction_manager &tm, void *root)
persistent_data::open_metadata_sm(transaction_manager &tm, void const *root)
{
sm_root_disk d;
sm_root v;

4
persistent-data/space-maps/disk.h
View File

@@ -29,13 +29,13 @@ namespace persistent_data {
create_disk_sm(transaction_manager &tm, block_address nr_blocks);
checked_space_map::ptr
open_disk_sm(transaction_manager &tm, void *root);
open_disk_sm(transaction_manager &tm, void const *root);
checked_space_map::ptr
create_metadata_sm(transaction_manager &tm, block_address nr_blocks);
checked_space_map::ptr
open_metadata_sm(transaction_manager &tm, void *root);
open_metadata_sm(transaction_manager &tm, void const *root);
bcache::validator::ptr bitmap_validator();