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

CHANGES

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

VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

base/file_utils.cc

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

caching/metadata.cc

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