Merge branch 'master' of github.com:jthornber/thin-provisioning-tools

Conflicts:
	thin-provisioning/metadata.cc
	thin-provisioning/thin_trim.cc
This commit is contained in:
Joe Thornber
2016-01-20 15:37:04 +00:00
6 changed files with 27 additions and 3 deletions

View File

@@ -105,7 +105,7 @@ metadata::metadata(block_manager<>::ptr bm, open_type ot,
sb_.data_mapping_root_ = mappings_->get_root();
sb_.device_details_root_ = details_->get_root();
sb_.data_block_size_ = data_block_size;
sb_.metadata_block_size_ = MD_BLOCK_SIZE;
sb_.metadata_block_size_ = MD_BLOCK_SIZE >> SECTOR_SHIFT;
sb_.metadata_nr_blocks_ = tm_->get_bm()->get_nr_blocks();
break;