[glibc PATCH] fcntl-linux.h: add F_OFD_*32 constants

[Jeff Layton]

On Thu, 2016-08-18 at 06:04 -0700, Mike Frysinger wrote:
> On 18 Aug 2016 08:03, Jeff Layton wrote:
> > 
> > > > +2016-08-18Â Â Jeff Layton <jlayton@redhat.com>
> > > > +	* sysdeps/unix/sysv/linux/bits/fcntl-linux.h:
> > > > +	Add F_OFD_GETLK32, F_OFD_SETLK32, F_OFD_SETLKW32
> 
> Should be a blank line after the first one.  look at all the other
> entries in this file as an example.
> 

Ok, will fix...


> > 
> > --- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
> > +++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
> > @@ -127,11 +127,20 @@
> > Â Â Â Â This means that they are inherited across fork or clone with CLONE_FILES
> > Â Â Â Â like BSD (flock) locks, and they are only released automatically when the
> > Â Â Â Â last reference to the the file description against which they were acquired
> > -Â Â Â is put. */
> > +   is put.  */
> > Â #ifdef __USE_GNU
> > > > -# define F_OFD_GETLK	36
> > > > -# define F_OFD_SETLK	37
> > > > -# define F_OFD_SETLKW	38
> > +# if __OFF_T_MATCHES_OFF64_T || defined __USE_FILE_OFFSET64
> > > > +#Â Â define F_OFD_GETLK		36
> > > > +#Â Â define F_OFD_SETLK		37
> > > > +#Â Â define F_OFD_SETLKW		38
> > +# else
> > > > +#Â Â define F_OFD_GETLK32		39
> > > > +#Â Â define F_OFD_SETLK32		40
> > > > +#Â Â define F_OFD_SETLKW32	41
> > > > +#Â Â define F_OFD_GETLK		F_OFD_GETLK32
> > > > +#Â Â define F_OFD_SETLK		F_OFD_SETLK32
> > > > +#Â Â define F_OFD_SETLKW		F_OFD_SETLKW32
> > +# endif
> > Â #endif
> 
> i think we should define *64 and *32 variants all the time, and
> then route the F_OFD_GETLK/etc... to them based on compile mode.
> -mike

Sorry, I don't quite understand here. The whole point is that the
existing F_OFD_* constants are already implicitly 64-bit. Why do we
need separate constants postfixed with "64" that no one will ever use?

-- 
Jeff Layton <jlayton@redhat.com>