emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joe Thornber 2017-12-12 15:28:17 +00:00
commit d6a5ced23b
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -1,3 +1,8 @@
v0.7.5
======
- Fix a bug that stopped cache_restore working with metadata version 2.
v0.7.4 v0.7.4
====== ======

2
VERSION
View File

@ -1 +1 @@
0.7.4 0.7.5

2
base/file_utils.cc
View File

@ -151,6 +151,8 @@ file_utils::zero_superblock(std::string const &path)
memset(buffer, 0, SUPERBLOCK_SIZE); memset(buffer, 0, SUPERBLOCK_SIZE);
if (::write(fd, buffer, SUPERBLOCK_SIZE) != SUPERBLOCK_SIZE) if (::write(fd, buffer, SUPERBLOCK_SIZE) != SUPERBLOCK_SIZE)
throw runtime_error("couldn't zero superblock"); throw runtime_error("couldn't zero superblock");
::close(fd);
} }
//---------------------------------------------------------------- //----------------------------------------------------------------

4
caching/metadata.cc
View File

@ -128,6 +128,10 @@ void
metadata::commit_mappings() metadata::commit_mappings()
{ {
sb_.mapping_root = mappings_->get_root(); sb_.mapping_root = mappings_->get_root();
if (sb_.version >= 2) {
dirty_bits_->flush();
sb_.dirty_root = dirty_bits_->get_root();
}
} }
void void