about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--sysdeps/unix/sysv/linux/bits/fcntl-linux.h7
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 579b5e28c1..ec80b446b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-10  Andreas Schwab  <schwab@suse.de>
+
+	[BZ #14964]
+	* sysdeps/unix/sysv/linux/bits/fcntl-linux.h (FALLOC_FL_KEEP_SIZE)
+	(FALLOC_FL_PUNCH_HOLE) [__USE_GNU]: New macros.
+
 2013-01-09  David S. Miller  <davem@davemloft.net>
 
 	[BZ# 15003]
diff --git a/NEWS b/NEWS
index 07acc4f86a..430c5d9d1e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.18
 
 * The following bugs are resolved with this release:
 
-  13951, 14317, 14981, 14982, 14985, 14994, 14996, 15003.
+  13951, 14317, 14964, 14981, 14982, 14985, 14994, 14996, 15003.
 
 
 Version 2.17
diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
index a8bb09075a..b5929bd292 100644
--- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
@@ -296,6 +296,13 @@ struct f_owner_ex
 # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
 
 
+/* Flags for fallocate.  */
+# define FALLOC_FL_KEEP_SIZE		1 /* Don't extend size of file
+					     even if offset + len is
+					     greater than file size.  */
+# define FALLOC_FL_PUNCH_HOLE		2 /* Create a hole in the file.  */
+
+
 /* File handle structure.  */
 struct file_handle
 {