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

Conflicts:
	thin-provisioning/metadata.cc
	thin-provisioning/thin_trim.cc
This commit is contained in:
Joe Thornber
2016-01-20 15:37:04 +00:00
6 changed files with 27 additions and 3 deletions

View File

@@ -6,6 +6,10 @@
#undef BLOCK_SIZE
#ifndef BLKDISCARD
#define BLKDISCARD _IO(0x12,119)
#endif
#include "persistent-data/file_utils.h"
#include "thin-provisioning/commands.h"
#include "metadata.h"