Merge branch 'master' into v0.7-devel

Conflicts: persistent-data/file_utils.cc persistent-data/file_utils.h
2016-04-05 13:13:10 +01:00
parent 036883b271 7b1a113021
commit 3c02151a4f
6 changed files with 49 additions and 30 deletions
--- a/persistent-data/file_utils.h
+++ b/persistent-data/file_utils.h
@ -10,6 +10,8 @@
 // FIXME: move to a different unit
 namespace persistent_data {
 	persistent_data::block_address get_nr_blocks(string const &path, sector_t block_size = MD_BLOCK_SIZE);
+	block_address get_nr_metadata_blocks(string const &path);
+
 	block_manager<>::ptr open_bm(std::string const &dev_path,
 				     block_manager<>::mode m, bool excl = true);