Merge branch 'master' into 2016-02-03-fix-thin-trim

This commit is contained in:
Joe Thornber
2016-03-31 16:39:54 +01:00
8 changed files with 91 additions and 11 deletions

View File

@ -773,4 +773,15 @@ persistent_data::open_metadata_sm(transaction_manager &tm, void *root)
checked_space_map::ptr(new sm_disk(store, tm, v))));
}
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_;
}
//----------------------------------------------------------------

View File

@ -36,6 +36,11 @@ namespace persistent_data {
checked_space_map::ptr
open_metadata_sm(transaction_manager &tm, void *root);
// 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);
}
//----------------------------------------------------------------