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:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user