From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org ([140.211.166.183]:57228 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752435AbcHRNEd (ORCPT ); Thu, 18 Aug 2016 09:04:33 -0400 Date: Thu, 18 Aug 2016 06:04:31 -0700 From: Mike Frysinger To: Jeff Layton Cc: libc-alpha@sourceware.org, linux-fsdevel@vger.kernel.org, chrubis@suse.cz Subject: Re: [glibc PATCH] fcntl-linux.h: add F_OFD_*32 constants Message-ID: <20160818130431.GH21655@vapier.lan> References: <1471521815-4340-1-git-send-email-jlayton@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Q6STzHxy03qt/hK9" Content-Disposition: inline In-Reply-To: <1471521815-4340-1-git-send-email-jlayton@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: --Q6STzHxy03qt/hK9 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline 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. > --- 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 --Q6STzHxy03qt/hK9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXtbJfAAoJEEFjO5/oN/WBDMAQAMllXXTSANVNcn/zWsX2zMIp V3vAT5RpEiVf4qeXJhq7zltYXr1n6q4L9OlFGs5SNJSBun8sQuJOcncwBnoEozat EO/IrPN5jY6jrQxegXCRlmQJy2c9Hv8JTe7PEfSS0BHRFC01xl1P4btrcscknyg7 ucC+aYZ8hFzBBw/g77SMbjPCJ+0zXKZazgB7Vzj2wfgEulSIfBxcys2E+7WcaZ+7 eSPy38oiHEwM9SeB9y7S8muopMzzvzxr4XAzCV6ECxbXoCaHLJKOYYJJXAxy+Onl GKnHLPwf928aiBtPBZ/vwyAS3g5ElUtlBz7+aMkzJ8ITw28ksj/0GGvGqNaZtC+x QG3dyOskAZ+XBL45xl09leUF8ptItptgS8JVslGlxgy62fY3KmTLgTloGLiC6Cdh ZiCuc0EbASzjYD9JRIkFvs8+p2JPQBC9XBOES5ylRTrQUj4X8X0DqyEzIdIKgZgH UYr0KMqZ4teaMhVkiiFz6hUfcljMJHR4pT8nvQuNTkRANiTrseeku8tTjUvO/T6o 7YvDqxzz0LmQmOUyxJO6N4wSJyzsblsyqKPNFwDyO4A+UCfXCQlWZFG2UinUcaLa neFNR37Sz+jnCwKByOvZ384tfjPIObB4LX3UAC+VOLbjU6JgwQDRVAp9WZ439I4n atDAhOAjI6fuheirYciL =8MQa -----END PGP SIGNATURE----- --Q6STzHxy03qt/hK9--