Merge branch 'master' into v0.7-devel

Conflicts: VERSION persistent-data/space-maps/disk.cc persistent-data/space-maps/disk.h
2016-03-22 12:04:51 +00:00
parent 5cbef4f6ef 72025c398e
commit 8b2ec7a3aa
7 changed files with 92 additions and 14 deletions
--- a/persistent-data/space-maps/disk.cc
+++ b/persistent-data/space-maps/disk.cc
@ -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_;
+}
+
 //----------------------------------------------------------------