Unverified Commit 306f7cc1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Palmer Dabbelt
Browse files

uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h 



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 error 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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGuo Ren <guoren@kernel.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20220405071314.3225832-3-guoren@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 9f79b8b7

arch/arm64/include/asm/compat.h

+0 −4
Original line number Diff line number Diff line
@@ -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;

arch/mips/include/asm/compat.h

+0 −4
Original line number Diff line number Diff line
@@ -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;

arch/mips/include/uapi/asm/fcntl.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/include/asm/compat.h

+0 −4
Original line number Diff line number Diff line
@@ -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;

arch/s390/include/asm/compat.h

+0 −4
Original line number Diff line number Diff line
@@ -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;