This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.24-475-g257dabc


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  257dabc059447934a90be6fce4b5d2a5f4b63dfd (commit)
      from  e96a3ca70319aa7cd6bef7c4c67007264ce4d972 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=257dabc059447934a90be6fce4b5d2a5f4b63dfd

commit 257dabc059447934a90be6fce4b5d2a5f4b63dfd
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Dec 14 18:23:15 2016 +0000

    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
--- 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
--- 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.  */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                  |    9 +++++++++
 sysdeps/unix/sysv/linux/bits/fcntl-linux.h |   10 +---------
 2 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]