On Wednesday 24 October 2012 15:08:46 Andreas Jaeger wrote:
>  #define F_GETLK		5	/* Get record locking info.  */
>  #define F_SETLK		6	/* Set record locking info (non-blocking).  */
>  #define F_SETLKW	7	/* Set record locking info (blocking).	*/

pretty sure these three can get deleted too

>  #define F_SETLK64	6	/* Set record locking info (non-blocking).  */
>  #define F_SETLKW64	7	/* Set record locking info (blocking).	*/

for these three, i wonder if we could make bits/fcntl-linux.h smarter.  like:
#ifndef F_GETLK64
# if __O_LARGEFILE
<current defines to 12/13/14>
# else
<new defines to the non-64bit versions>
# endif
#endif

we'd have to tweak the logic so F_GETLK also does:
#ifndef F_GETLK
# if !defined __USE_FILE_OFFSET64 && __O_LARGEFILE
<current defines to 5/6/7>
...

the rest looks fine
-mike