Merge branch 'master' into v0.7-devel
Conflicts: persistent-data/file_utils.cc persistent-data/file_utils.h
This commit is contained in:
@@ -44,7 +44,7 @@ using namespace thin_provisioning;
|
||||
namespace {
|
||||
block_manager<>::ptr
|
||||
open_bm(string const &path) {
|
||||
block_address nr_blocks = get_nr_blocks(path);
|
||||
block_address nr_blocks = get_nr_metadata_blocks(path);
|
||||
block_manager<>::mode m = block_manager<>::READ_ONLY;
|
||||
return block_manager<>::ptr(new block_manager<>(path, nr_blocks, 1, m));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user