From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw0-f171.google.com ([209.85.161.171]:35596 "EHLO mail-yw0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946004AbcHRN5T (ORCPT ); Thu, 18 Aug 2016 09:57:19 -0400 Received: by mail-yw0-f171.google.com with SMTP id j12so10058120ywb.2 for ; Thu, 18 Aug 2016 06:57:19 -0700 (PDT) Message-ID: <1471528199.2504.5.camel@redhat.com> Subject: Re: [glibc PATCH] fcntl-linux.h: add F_OFD_*32 constants From: Jeff Layton To: Mike Frysinger Cc: libc-alpha@sourceware.org, linux-fsdevel@vger.kernel.org, chrubis@suse.cz Date: Thu, 18 Aug 2016 09:49:59 -0400 In-Reply-To: <20160818130431.GH21655@vapier.lan> References: <1471521815-4340-1-git-send-email-jlayton@redhat.com> <20160818130431.GH21655@vapier.lan> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-fsdevel-owner@vger.kernel.org List-ID: 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 > > > > + * 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