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

Merge branch 'master' into v0.7-devel

Browse Source 
Conflicts:
	VERSION
	persistent-data/space-maps/disk.cc
	persistent-data/space-maps/disk.h
This commit is contained in:
Joe Thornber
2016-03-22 12:04:51 +00:00
parent 5cbef4f6ef 72025c398e
commit 8b2ec7a3aa
7 changed files with 92 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -794,4 +794,15 @@ persistent_data::index_validator() {
return bcache::validator::ptr(new index_block_validator());
}
block_address
persistent_data::get_nr_blocks_in_data_sm(transaction_manager &tm, void *root)
{
sm_root_disk d;
sm_root v;
::memcpy(&d, root, sizeof(d));
sm_root_traits::unpack(d, v);
return v.nr_blocks_;
}
//----------------------------------------------------------------

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

@ -37,11 +37,14 @@ namespace persistent_data {
checked_space_map::ptr
open_metadata_sm(transaction_manager &tm, void *root);
bcache::validator::ptr
bitmap_validator();
bcache::validator::ptr bitmap_validator();
bcache::validator::ptr
index_validator();
bcache::validator::ptr index_validator();
// Get the number of data blocks with minimal IO. Used when
// repairing to avoid the bulk of the space maps.
block_address
get_nr_blocks_in_data_sm(transaction_manager &tm, void *root);
}
//----------------------------------------------------------------