Merge pull request #253 from FrankYu/master

use the appropriate headers instead of define the macros
sheepdog · Jun 16, 2016 · 366ccda · 366ccda
2 parents a629775 + d719510
commit 366ccda
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/lib/common.c b/lib/common.c
@@ -18,18 +18,12 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <inttypes.h>
+#include <linux/falloc.h>
 
 #include "util.h"
 #include "work.h"
 #include "common.h"
 
-#ifndef FALLOC_FL_KEEP_SIZE
-#define FALLOC_FL_KEEP_SIZE 0x01
-#endif
-#ifndef FALLOC_FL_PUNCH_HOLE
-#define FALLOC_FL_PUNCH_HOLE 0x02
-#endif
-
 static struct work_queue *util_wqueue;
 
 void register_util_wq(struct work_queue *wq)

diff --git a/sheep/store/common.c b/sheep/store/common.c
@@ -20,10 +20,6 @@ char *epoch_path;
 struct store_driver *sd_store;
 LIST_HEAD(store_drivers);
 
-#ifndef FALLOC_FL_PUNCH_HOLE
-#define FALLOC_FL_PUNCH_HOLE 0x02
-#endif
-
 #define sector_algined(x) ({ ((x) & (SECTOR_SIZE - 1)) == 0; })
 
 static inline bool iocb_is_aligned(const struct siocb *iocb)

diff --git a/tests/unit/lib/test_punchhole.c b/tests/unit/lib/test_punchhole.c
@@ -4,6 +4,7 @@
 #include <fcntl.h>	/* O_* flags */
 #include <unity.h>
 #include <cmock.h>
+#include <linux/falloc.h>
 
 #include "util.h"
 #include "Mocklogger.h"