| Message ID | 20220131064933.3780271-5-hch@lst.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define | expand |
Acked-by: Guo Ren <guoren@kernel.org> On Mon, Jan 31, 2022 at 2:49 PM Christoph Hellwig <hch@lst.de> wrote: > > The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented > for the 32-bit syscall APIs, but are also needed for compat handling > on 64-bit kernels. > > Consolidate them in unistd.h instead of definining the internal compat > definitions in compat.h, which is rather errror prone (e.g. parisc > gets the values wrong currently). > > Note that before this change they were never visible to userspace due > to the fact that CONFIG_64BIT is only set for kernel builds. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/arm64/include/asm/compat.h | 4 ---- > arch/mips/include/asm/compat.h | 4 ---- > arch/mips/include/uapi/asm/fcntl.h | 4 ++-- > arch/powerpc/include/asm/compat.h | 4 ---- > arch/s390/include/asm/compat.h | 4 ---- > arch/sparc/include/asm/compat.h | 4 ---- > arch/x86/include/asm/compat.h | 4 ---- > include/uapi/asm-generic/fcntl.h | 4 ++-- > tools/include/uapi/asm-generic/fcntl.h | 2 -- > 9 files changed, 4 insertions(+), 30 deletions(-) > > diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h > index eaa6ca062d89b..2763287654081 100644 > --- a/arch/arm64/include/asm/compat.h > +++ b/arch/arm64/include/asm/compat.h > @@ -73,10 +73,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h > index bbb3bc5a42fd8..6a350c1f70d7e 100644 > --- a/arch/mips/include/asm/compat.h > +++ b/arch/mips/include/asm/compat.h > @@ -65,10 +65,6 @@ struct compat_flock { > s32 pad[4]; > }; > > -#define F_GETLK64 33 > -#define F_SETLK64 34 > -#define F_SETLKW64 35 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h > index 9e44ac810db94..0369a38e3d4f2 100644 > --- a/arch/mips/include/uapi/asm/fcntl.h > +++ b/arch/mips/include/uapi/asm/fcntl.h > @@ -44,11 +44,11 @@ > #define F_SETOWN 24 /* for sockets. */ > #define F_GETOWN 23 /* for sockets. */ > > -#ifndef __mips64 > +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) > #define F_GETLK64 33 /* using 'struct flock64' */ > #define F_SETLK64 34 > #define F_SETLKW64 35 > -#endif > +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ > > #if _MIPS_SIM != _MIPS_SIM_ABI64 > #define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; > diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h > index 7afc96fb6524b..83d8f70779cbc 100644 > --- a/arch/powerpc/include/asm/compat.h > +++ b/arch/powerpc/include/asm/compat.h > @@ -52,10 +52,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h > index cdc7ae72529d8..0f14b3188b1bb 100644 > --- a/arch/s390/include/asm/compat.h > +++ b/arch/s390/include/asm/compat.h > @@ -110,10 +110,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h > index bd949fcf9d63b..108078751bb5a 100644 > --- a/arch/sparc/include/asm/compat.h > +++ b/arch/sparc/include/asm/compat.h > @@ -84,10 +84,6 @@ struct compat_flock { > short __unused; > }; > > -#define F_GETLK64 12 > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h > index 7516e4199b3c6..8d19a212f4f26 100644 > --- a/arch/x86/include/asm/compat.h > +++ b/arch/x86/include/asm/compat.h > @@ -58,10 +58,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > /* > * IA32 uses 4 byte alignment for 64 bit quantities, > * so we need to pack this structure. > diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h > index 98f4ff165b776..8c05d3d89ff18 100644 > --- a/include/uapi/asm-generic/fcntl.h > +++ b/include/uapi/asm-generic/fcntl.h > @@ -116,13 +116,13 @@ > #define F_GETSIG 11 /* for sockets. */ > #endif > > -#ifndef CONFIG_64BIT > +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) > #ifndef F_GETLK64 > #define F_GETLK64 12 /* using 'struct flock64' */ > #define F_SETLK64 13 > #define F_SETLKW64 14 > #endif > -#endif > +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ > > #ifndef F_SETOWN_EX > #define F_SETOWN_EX 15 > diff --git a/tools/include/uapi/asm-generic/fcntl.h b/tools/include/uapi/asm-generic/fcntl.h > index bf961a71802e0..6e16722026f39 100644 > --- a/tools/include/uapi/asm-generic/fcntl.h > +++ b/tools/include/uapi/asm-generic/fcntl.h > @@ -115,13 +115,11 @@ > #define F_GETSIG 11 /* for sockets. */ > #endif > > -#ifndef CONFIG_64BIT > #ifndef F_GETLK64 > #define F_GETLK64 12 /* using 'struct flock64' */ > #define F_SETLK64 13 > #define F_SETLKW64 14 > #endif > -#endif > > #ifndef F_SETOWN_EX > #define F_SETOWN_EX 15 > -- > 2.30.2 >
On Mon, Jan 31, 2022 at 2:49 PM Christoph Hellwig <hch@lst.de> wrote: > > The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented > for the 32-bit syscall APIs, but are also needed for compat handling > on 64-bit kernels. > > Consolidate them in unistd.h instead of definining the internal compat > definitions in compat.h, which is rather errror prone (e.g. parisc > gets the values wrong currently). > > Note that before this change they were never visible to userspace due > to the fact that CONFIG_64BIT is only set for kernel builds. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/arm64/include/asm/compat.h | 4 ---- > arch/mips/include/asm/compat.h | 4 ---- > arch/mips/include/uapi/asm/fcntl.h | 4 ++-- > arch/powerpc/include/asm/compat.h | 4 ---- > arch/s390/include/asm/compat.h | 4 ---- > arch/sparc/include/asm/compat.h | 4 ---- > arch/x86/include/asm/compat.h | 4 ---- > include/uapi/asm-generic/fcntl.h | 4 ++-- > tools/include/uapi/asm-generic/fcntl.h | 2 -- > 9 files changed, 4 insertions(+), 30 deletions(-) > > diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h > index eaa6ca062d89b..2763287654081 100644 > --- a/arch/arm64/include/asm/compat.h > +++ b/arch/arm64/include/asm/compat.h > @@ -73,10 +73,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h > index bbb3bc5a42fd8..6a350c1f70d7e 100644 > --- a/arch/mips/include/asm/compat.h > +++ b/arch/mips/include/asm/compat.h > @@ -65,10 +65,6 @@ struct compat_flock { > s32 pad[4]; > }; > > -#define F_GETLK64 33 > -#define F_SETLK64 34 > -#define F_SETLKW64 35 Oops we can't remove above, right? > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h > index 9e44ac810db94..0369a38e3d4f2 100644 > --- a/arch/mips/include/uapi/asm/fcntl.h > +++ b/arch/mips/include/uapi/asm/fcntl.h > @@ -44,11 +44,11 @@ > #define F_SETOWN 24 /* for sockets. */ > #define F_GETOWN 23 /* for sockets. */ > > -#ifndef __mips64 > +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) > #define F_GETLK64 33 /* using 'struct flock64' */ > #define F_SETLK64 34 > #define F_SETLKW64 35 > -#endif > +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ > > #if _MIPS_SIM != _MIPS_SIM_ABI64 > #define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; > diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h > index 7afc96fb6524b..83d8f70779cbc 100644 > --- a/arch/powerpc/include/asm/compat.h > +++ b/arch/powerpc/include/asm/compat.h > @@ -52,10 +52,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h > index cdc7ae72529d8..0f14b3188b1bb 100644 > --- a/arch/s390/include/asm/compat.h > +++ b/arch/s390/include/asm/compat.h > @@ -110,10 +110,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h > index bd949fcf9d63b..108078751bb5a 100644 > --- a/arch/sparc/include/asm/compat.h > +++ b/arch/sparc/include/asm/compat.h > @@ -84,10 +84,6 @@ struct compat_flock { > short __unused; > }; > > -#define F_GETLK64 12 > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h > index 7516e4199b3c6..8d19a212f4f26 100644 > --- a/arch/x86/include/asm/compat.h > +++ b/arch/x86/include/asm/compat.h > @@ -58,10 +58,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > /* > * IA32 uses 4 byte alignment for 64 bit quantities, > * so we need to pack this structure. > diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h > index 98f4ff165b776..8c05d3d89ff18 100644 > --- a/include/uapi/asm-generic/fcntl.h > +++ b/include/uapi/asm-generic/fcntl.h > @@ -116,13 +116,13 @@ > #define F_GETSIG 11 /* for sockets. */ > #endif > > -#ifndef CONFIG_64BIT > +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) > #ifndef F_GETLK64 > #define F_GETLK64 12 /* using 'struct flock64' */ > #define F_SETLK64 13 > #define F_SETLKW64 14 > #endif > -#endif > +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ > > #ifndef F_SETOWN_EX > #define F_SETOWN_EX 15 > diff --git a/tools/include/uapi/asm-generic/fcntl.h b/tools/include/uapi/asm-generic/fcntl.h > index bf961a71802e0..6e16722026f39 100644 > --- a/tools/include/uapi/asm-generic/fcntl.h > +++ b/tools/include/uapi/asm-generic/fcntl.h > @@ -115,13 +115,11 @@ > #define F_GETSIG 11 /* for sockets. */ > #endif > > -#ifndef CONFIG_64BIT > #ifndef F_GETLK64 > #define F_GETLK64 12 /* using 'struct flock64' */ > #define F_SETLK64 13 > #define F_SETLKW64 14 > #endif > -#endif > > #ifndef F_SETOWN_EX > #define F_SETOWN_EX 15 > -- > 2.30.2 >
On Tue, Feb 1, 2022 at 11:02 AM Guo Ren <guoren@kernel.org> wrote: > > On Mon, Jan 31, 2022 at 2:49 PM Christoph Hellwig <hch@lst.de> wrote: > > > > The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented > > for the 32-bit syscall APIs, but are also needed for compat handling > > on 64-bit kernels. > > > > Consolidate them in unistd.h instead of definining the internal compat > > definitions in compat.h, which is rather errror prone (e.g. parisc > > gets the values wrong currently). > > > > Note that before this change they were never visible to userspace due > > to the fact that CONFIG_64BIT is only set for kernel builds. > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > --- > > arch/arm64/include/asm/compat.h | 4 ---- > > arch/mips/include/asm/compat.h | 4 ---- > > arch/mips/include/uapi/asm/fcntl.h | 4 ++-- > > arch/powerpc/include/asm/compat.h | 4 ---- > > arch/s390/include/asm/compat.h | 4 ---- > > arch/sparc/include/asm/compat.h | 4 ---- > > arch/x86/include/asm/compat.h | 4 ---- > > include/uapi/asm-generic/fcntl.h | 4 ++-- > > tools/include/uapi/asm-generic/fcntl.h | 2 -- > > 9 files changed, 4 insertions(+), 30 deletions(-) > > > > diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h > > index eaa6ca062d89b..2763287654081 100644 > > --- a/arch/arm64/include/asm/compat.h > > +++ b/arch/arm64/include/asm/compat.h > > @@ -73,10 +73,6 @@ struct compat_flock { > > compat_pid_t l_pid; > > }; > > > > -#define F_GETLK64 12 /* using 'struct flock64' */ > > -#define F_SETLK64 13 > > -#define F_SETLKW64 14 > > - > > struct compat_flock64 { > > short l_type; > > short l_whence; > > diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h > > index bbb3bc5a42fd8..6a350c1f70d7e 100644 > > --- a/arch/mips/include/asm/compat.h > > +++ b/arch/mips/include/asm/compat.h > > @@ -65,10 +65,6 @@ struct compat_flock { > > s32 pad[4]; > > }; > > > > -#define F_GETLK64 33 > > -#define F_SETLK64 34 > > -#define F_SETLKW64 35 > Oops we can't remove above, right? No problem, I missing, it's okay. All come from arch/mips/include/uapi/asm/fcntl.h > > > - > > struct compat_flock64 { > > short l_type; > > short l_whence; > > diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h > > index 9e44ac810db94..0369a38e3d4f2 100644 > > --- a/arch/mips/include/uapi/asm/fcntl.h > > +++ b/arch/mips/include/uapi/asm/fcntl.h > > @@ -44,11 +44,11 @@ > > #define F_SETOWN 24 /* for sockets. */ > > #define F_GETOWN 23 /* for sockets. */ > > > > -#ifndef __mips64 > > +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) > > #define F_GETLK64 33 /* using 'struct flock64' */ > > #define F_SETLK64 34 > > #define F_SETLKW64 35 > > -#endif > > +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ > > > > #if _MIPS_SIM != _MIPS_SIM_ABI64 > > #define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; > > diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h > > index 7afc96fb6524b..83d8f70779cbc 100644 > > --- a/arch/powerpc/include/asm/compat.h > > +++ b/arch/powerpc/include/asm/compat.h > > @@ -52,10 +52,6 @@ struct compat_flock { > > compat_pid_t l_pid; > > }; > > > > -#define F_GETLK64 12 /* using 'struct flock64' */ > > -#define F_SETLK64 13 > > -#define F_SETLKW64 14 > > - > > struct compat_flock64 { > > short l_type; > > short l_whence; > > diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h > > index cdc7ae72529d8..0f14b3188b1bb 100644 > > --- a/arch/s390/include/asm/compat.h > > +++ b/arch/s390/include/asm/compat.h > > @@ -110,10 +110,6 @@ struct compat_flock { > > compat_pid_t l_pid; > > }; > > > > -#define F_GETLK64 12 > > -#define F_SETLK64 13 > > -#define F_SETLKW64 14 > > - > > struct compat_flock64 { > > short l_type; > > short l_whence; > > diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h > > index bd949fcf9d63b..108078751bb5a 100644 > > --- a/arch/sparc/include/asm/compat.h > > +++ b/arch/sparc/include/asm/compat.h > > @@ -84,10 +84,6 @@ struct compat_flock { > > short __unused; > > }; > > > > -#define F_GETLK64 12 > > -#define F_SETLK64 13 > > -#define F_SETLKW64 14 > > - > > struct compat_flock64 { > > short l_type; > > short l_whence; > > diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h > > index 7516e4199b3c6..8d19a212f4f26 100644 > > --- a/arch/x86/include/asm/compat.h > > +++ b/arch/x86/include/asm/compat.h > > @@ -58,10 +58,6 @@ struct compat_flock { > > compat_pid_t l_pid; > > }; > > > > -#define F_GETLK64 12 /* using 'struct flock64' */ > > -#define F_SETLK64 13 > > -#define F_SETLKW64 14 > > - > > /* > > * IA32 uses 4 byte alignment for 64 bit quantities, > > * so we need to pack this structure. > > diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h > > index 98f4ff165b776..8c05d3d89ff18 100644 > > --- a/include/uapi/asm-generic/fcntl.h > > +++ b/include/uapi/asm-generic/fcntl.h > > @@ -116,13 +116,13 @@ > > #define F_GETSIG 11 /* for sockets. */ > > #endif > > > > -#ifndef CONFIG_64BIT > > +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) > > #ifndef F_GETLK64 > > #define F_GETLK64 12 /* using 'struct flock64' */ > > #define F_SETLK64 13 > > #define F_SETLKW64 14 > > #endif > > -#endif > > +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ > > > > #ifndef F_SETOWN_EX > > #define F_SETOWN_EX 15 > > diff --git a/tools/include/uapi/asm-generic/fcntl.h b/tools/include/uapi/asm-generic/fcntl.h > > index bf961a71802e0..6e16722026f39 100644 > > --- a/tools/include/uapi/asm-generic/fcntl.h > > +++ b/tools/include/uapi/asm-generic/fcntl.h > > @@ -115,13 +115,11 @@ > > #define F_GETSIG 11 /* for sockets. */ > > #endif > > > > -#ifndef CONFIG_64BIT > > #ifndef F_GETLK64 > > #define F_GETLK64 12 /* using 'struct flock64' */ > > #define F_SETLK64 13 > > #define F_SETLKW64 14 > > #endif > > -#endif > > > > #ifndef F_SETOWN_EX > > #define F_SETOWN_EX 15 > > -- > > 2.30.2 > > > > > -- > Best Regards > Guo Ren > > ML: https://lore.kernel.org/linux-csky/
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index eaa6ca062d89b..2763287654081 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -73,10 +73,6 @@ struct compat_flock { compat_pid_t l_pid; }; -#define F_GETLK64 12 /* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 - struct compat_flock64 { short l_type; short l_whence; diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h index bbb3bc5a42fd8..6a350c1f70d7e 100644 --- a/arch/mips/include/asm/compat.h +++ b/arch/mips/include/asm/compat.h @@ -65,10 +65,6 @@ struct compat_flock { s32 pad[4]; }; -#define F_GETLK64 33 -#define F_SETLK64 34 -#define F_SETLKW64 35 - struct compat_flock64 { short l_type; short l_whence; diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h index 9e44ac810db94..0369a38e3d4f2 100644 --- a/arch/mips/include/uapi/asm/fcntl.h +++ b/arch/mips/include/uapi/asm/fcntl.h @@ -44,11 +44,11 @@ #define F_SETOWN 24 /* for sockets. */ #define F_GETOWN 23 /* for sockets. */ -#ifndef __mips64 +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) #define F_GETLK64 33 /* using 'struct flock64' */ #define F_SETLK64 34 #define F_SETLKW64 35 -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #if _MIPS_SIM != _MIPS_SIM_ABI64 #define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h index 7afc96fb6524b..83d8f70779cbc 100644 --- a/arch/powerpc/include/asm/compat.h +++ b/arch/powerpc/include/asm/compat.h @@ -52,10 +52,6 @@ struct compat_flock { compat_pid_t l_pid; }; -#define F_GETLK64 12 /* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 - struct compat_flock64 { short l_type; short l_whence; diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h index cdc7ae72529d8..0f14b3188b1bb 100644 --- a/arch/s390/include/asm/compat.h +++ b/arch/s390/include/asm/compat.h @@ -110,10 +110,6 @@ struct compat_flock { compat_pid_t l_pid; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 - struct compat_flock64 { short l_type; short l_whence; diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h index bd949fcf9d63b..108078751bb5a 100644 --- a/arch/sparc/include/asm/compat.h +++ b/arch/sparc/include/asm/compat.h @@ -84,10 +84,6 @@ struct compat_flock { short __unused; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 - struct compat_flock64 { short l_type; short l_whence; diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h index 7516e4199b3c6..8d19a212f4f26 100644 --- a/arch/x86/include/asm/compat.h +++ b/arch/x86/include/asm/compat.h @@ -58,10 +58,6 @@ struct compat_flock { compat_pid_t l_pid; }; -#define F_GETLK64 12 /* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 - /* * IA32 uses 4 byte alignment for 64 bit quantities, * so we need to pack this structure. diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h index 98f4ff165b776..8c05d3d89ff18 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -116,13 +116,13 @@ #define F_GETSIG 11 /* for sockets. */ #endif -#ifndef CONFIG_64BIT +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) #ifndef F_GETLK64 #define F_GETLK64 12 /* using 'struct flock64' */ #define F_SETLK64 13 #define F_SETLKW64 14 #endif -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #ifndef F_SETOWN_EX #define F_SETOWN_EX 15 diff --git a/tools/include/uapi/asm-generic/fcntl.h b/tools/include/uapi/asm-generic/fcntl.h index bf961a71802e0..6e16722026f39 100644 --- a/tools/include/uapi/asm-generic/fcntl.h +++ b/tools/include/uapi/asm-generic/fcntl.h @@ -115,13 +115,11 @@ #define F_GETSIG 11 /* for sockets. */ #endif -#ifndef CONFIG_64BIT #ifndef F_GETLK64 #define F_GETLK64 12 /* using 'struct flock64' */ #define F_SETLK64 13 #define F_SETLKW64 14 #endif -#endif #ifndef F_SETOWN_EX #define F_SETOWN_EX 15
The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented for the 32-bit syscall APIs, but are also needed for compat handling on 64-bit kernels. Consolidate them in unistd.h instead of definining the internal compat definitions in compat.h, which is rather errror prone (e.g. parisc gets the values wrong currently). Note that before this change they were never visible to userspace due to the fact that CONFIG_64BIT is only set for kernel builds. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/arm64/include/asm/compat.h | 4 ---- arch/mips/include/asm/compat.h | 4 ---- arch/mips/include/uapi/asm/fcntl.h | 4 ++-- arch/powerpc/include/asm/compat.h | 4 ---- arch/s390/include/asm/compat.h | 4 ---- arch/sparc/include/asm/compat.h | 4 ---- arch/x86/include/asm/compat.h | 4 ---- include/uapi/asm-generic/fcntl.h | 4 ++-- tools/include/uapi/asm-generic/fcntl.h | 2 -- 9 files changed, 4 insertions(+), 30 deletions(-)