Include <linux/falloc.h> in bits/fcntl-linux.h.

This patch makes bits/fcntl-linux.h include <linux/falloc.h> to define
the FALLOC_* flags under __USE_GNU (linux/falloc.h defines only those
bits, nothing else).

Tested for x86_64 and x86.

	* sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_GNU]: Include
	<linux/falloc.h>.
	(FALLOC_FL_KEEP_SIZE): Remove.
	(FALLOC_FL_PUNCH_HOLE): Likewise.
	(FALLOC_FL_COLLAPSE_RANGE): Likewise.
	(FALLOC_FL_ZERO_RANGE): Likewise.

diff --git a/ChangeLog b/ChangeLog
index c7b055d..32ce9af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-12-14  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_GNU]: Include
+       <linux/falloc.h>.
+       (FALLOC_FL_KEEP_SIZE): Remove.
+       (FALLOC_FL_PUNCH_HOLE): Likewise.
+       (FALLOC_FL_COLLAPSE_RANGE): Likewise.
+       (FALLOC_FL_ZERO_RANGE): Likewise.
+
 2016-12-14  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
        * stdlib/tst-strfrom.h (ENTRY): Replace use of CSUF with LSUF.

diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
index 7e5b0ae..159ce14 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
@@ -318,15 +318,7 @@ struct f_owner_ex
 
 
 /* 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.  */
-# define FALLOC_FL_COLLAPSE_RANGE      8 /* Remove a range of a file
-                                            without leaving a
-                                            hole.  */
-# define FALLOC_FL_ZERO_RANGE          16 /* Convert a range of a
-                                             file to zeros.  */
+# include <linux/falloc.h>
 
 
 /* File handle structure.  */