Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755308AbZKLXdD (ORCPT ); Thu, 12 Nov 2009 18:33:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755237AbZKLXdA (ORCPT ); Thu, 12 Nov 2009 18:33:00 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:55255 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755034AbZKLXc7 (ORCPT ); Thu, 12 Nov 2009 18:32:59 -0500 Date: Fri, 13 Nov 2009 10:32:57 +1100 From: Stephen Rothwell To: Andrew Morton , Linus Cc: Peter Zijlstra , "Joseph S. Myers" , linux-api@vger.kernel.org, lkml , Oleg Nesterov , Stephane Eranian , Michael Kerrisk , Roland McGrath , Al Viro , Christoph Hellwig , Ingo Molnar Subject: Re: F_SETOWN_EX and F_GETLK64 conflict Message-Id: <20091113103257.1f4f6e12.sfr@canb.auug.org.au> In-Reply-To: <20091030162906.fbc1c40b.sfr@canb.auug.org.au> References: <1254691822.21044.9.camel@laptop> <20091030161320.17d07dc9.sfr@canb.auug.org.au> <20091030162906.fbc1c40b.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.3; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3757 Lines: 116 Hi Andrew, On Fri, 30 Oct 2009 16:29:06 +1100 Stephen Rothwell wrote: > > On Fri, 30 Oct 2009 16:13:20 +1100 Stephen Rothwell wrote: > > > > This is why we have F_LINUX_SPECIFIC_BASE and use it in > > include/linux/fcntl.h ... it should be used as a base for any new fcntl > > types since they don't require backward compatibility. > > Something like this (not even built, but pretty obvious): So I provide an alternative patch (which IMHO is a better one), I get no comments, and 2 weeks later the original is now in Linus' tree ... The new fcntl numbers that are being fixed here were only introduced after v2.6.31, so there is no ABI breakage by changing them. > From: Stephen Rothwell > Date: Fri, 30 Oct 2009 16:25:51 +1100 > Subject: [PATCH] fcntl: use consistent valuse for F_SETOWN_EX/F_GETOWN_EX > > This is what F_LINUX_SPECIFIC_BASE was meant for. > > Signed-off-by: Stephen Rothwell > --- > arch/alpha/include/asm/fcntl.h | 2 -- > arch/parisc/include/asm/fcntl.h | 2 -- > include/asm-generic/fcntl.h | 14 -------------- > include/linux/fcntl.h | 12 ++++++++++++ > 4 files changed, 12 insertions(+), 18 deletions(-) > > diff --git a/arch/alpha/include/asm/fcntl.h b/arch/alpha/include/asm/fcntl.h > index e42823e..25da001 100644 > --- a/arch/alpha/include/asm/fcntl.h > +++ b/arch/alpha/include/asm/fcntl.h > @@ -26,8 +26,6 @@ > #define F_GETOWN 6 /* for sockets. */ > #define F_SETSIG 10 /* for sockets. */ > #define F_GETSIG 11 /* for sockets. */ > -#define F_SETOWN_EX 12 > -#define F_GETOWN_EX 13 > > /* for posix fcntl() and lockf() */ > #define F_RDLCK 1 > diff --git a/arch/parisc/include/asm/fcntl.h b/arch/parisc/include/asm/fcntl.h > index 5f39d55..1e1c824 100644 > --- a/arch/parisc/include/asm/fcntl.h > +++ b/arch/parisc/include/asm/fcntl.h > @@ -28,8 +28,6 @@ > #define F_SETOWN 12 /* for sockets. */ > #define F_SETSIG 13 /* for sockets. */ > #define F_GETSIG 14 /* for sockets. */ > -#define F_GETOWN_EX 15 > -#define F_SETOWN_EX 16 > > /* for posix fcntl() and lockf() */ > #define F_RDLCK 01 > diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h > index 0c3dd86..980d6b5 100644 > --- a/include/asm-generic/fcntl.h > +++ b/include/asm-generic/fcntl.h > @@ -73,20 +73,6 @@ > #define F_SETSIG 10 /* for sockets. */ > #define F_GETSIG 11 /* for sockets. */ > #endif > -#ifndef F_SETOWN_EX > -#define F_SETOWN_EX 12 > -#define F_GETOWN_EX 13 > -#endif > - > -#define F_OWNER_TID 0 > -#define F_OWNER_PID 1 > -#define F_OWNER_GID 2 > - > -struct f_owner_ex { > - int type; > - pid_t pid; > -}; > - > /* for F_[GET|SET]FL */ > #define FD_CLOEXEC 1 /* actually anything with low bit set goes */ > > diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h > index 8603740..b34c41d 100644 > --- a/include/linux/fcntl.h > +++ b/include/linux/fcntl.h > @@ -40,6 +40,18 @@ > unlinking file. */ > #define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ > > +#define F_SETOWN_EX (F_LINUX_SPECIFIC_BASE + 7) > +#define F_GETOWN_EX (F_LINUX_SPECIFIC_BASE + 8) > + > +#define F_OWNER_TID 0 > +#define F_OWNER_PID 1 > +#define F_OWNER_GID 2 > + > +struct f_owner_ex { > + int type; > + pid_t pid; > +}; > + > #ifdef __KERNEL__ > > #ifndef force_o_largefile -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/