From: Karel Zak <kzak@redhat.com>
Date: Wed, 23 Nov 2011 14:19:20 +0000 (+0100)
Subject: fallocate: clean up fallbacks for FALLOC_FL_* flags
X-Git-Tag: v2.21-rc1~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f75b8e5cdfa40b81a0b631b02491a99115409371;p=thirdparty%2Futil-linux.git

fallocate: clean up fallbacks for FALLOC_FL_* flags

Reported-by: Voelker, Bernhard <bernhard.voelker@siemens-enterprise.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
index b58485a780..ef19a770bb 100644
--- a/sys-utils/fallocate.c
+++ b/sys-utils/fallocate.c
@@ -38,8 +38,13 @@
 
 #ifdef HAVE_LINUX_FALLOC_H
 # include <linux/falloc.h>	/* for FALLOC_FL_* flags */
-#else
+#endif
+
+#ifndef FALLOC_FL_KEEP_SIZE
 # define FALLOC_FL_KEEP_SIZE 1
+#endif
+
+#ifndef FALLOC_FL_PUNCH_HOLE
 # define FALLOC_FL_PUNCH_HOLE 2
 #endif