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

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.orgSigned-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 9f79b8b7
...@@ -73,10 +73,6 @@ struct compat_flock { ...@@ -73,10 +73,6 @@ struct compat_flock {
compat_pid_t l_pid; compat_pid_t l_pid;
}; };
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
struct compat_flock64 { struct compat_flock64 {
short l_type; short l_type;
short l_whence; short l_whence;
......
...@@ -65,10 +65,6 @@ struct compat_flock { ...@@ -65,10 +65,6 @@ struct compat_flock {
s32 pad[4]; s32 pad[4];
}; };
#define F_GETLK64 33
#define F_SETLK64 34
#define F_SETLKW64 35
struct compat_flock64 { struct compat_flock64 {
short l_type; short l_type;
short l_whence; short l_whence;
......
...@@ -44,11 +44,11 @@ ...@@ -44,11 +44,11 @@
#define F_SETOWN 24 /* for sockets. */ #define F_SETOWN 24 /* for sockets. */
#define F_GETOWN 23 /* 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_GETLK64 33 /* using 'struct flock64' */
#define F_SETLK64 34 #define F_SETLK64 34
#define F_SETLKW64 35 #define F_SETLKW64 35
#endif #endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */
#if _MIPS_SIM != _MIPS_SIM_ABI64 #if _MIPS_SIM != _MIPS_SIM_ABI64
#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; #define __ARCH_FLOCK_EXTRA_SYSID long l_sysid;
......
...@@ -52,10 +52,6 @@ struct compat_flock { ...@@ -52,10 +52,6 @@ struct compat_flock {
compat_pid_t l_pid; compat_pid_t l_pid;
}; };
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
struct compat_flock64 { struct compat_flock64 {
short l_type; short l_type;
short l_whence; short l_whence;
......
...@@ -110,10 +110,6 @@ struct compat_flock { ...@@ -110,10 +110,6 @@ struct compat_flock {
compat_pid_t l_pid; compat_pid_t l_pid;
}; };
#define F_GETLK64 12
#define F_SETLK64 13
#define F_SETLKW64 14
struct compat_flock64 { struct compat_flock64 {
short l_type; short l_type;
short l_whence; short l_whence;
......
...@@ -84,10 +84,6 @@ struct compat_flock { ...@@ -84,10 +84,6 @@ struct compat_flock {
short __unused; short __unused;
}; };
#define F_GETLK64 12
#define F_SETLK64 13
#define F_SETLKW64 14
struct compat_flock64 { struct compat_flock64 {
short l_type; short l_type;
short l_whence; short l_whence;
......
...@@ -58,10 +58,6 @@ struct compat_flock { ...@@ -58,10 +58,6 @@ struct compat_flock {
compat_pid_t l_pid; 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, * IA32 uses 4 byte alignment for 64 bit quantities,
* so we need to pack this structure. * so we need to pack this structure.
......
...@@ -116,13 +116,13 @@ ...@@ -116,13 +116,13 @@
#define F_GETSIG 11 /* for sockets. */ #define F_GETSIG 11 /* for sockets. */
#endif #endif
#ifndef CONFIG_64BIT #if __BITS_PER_LONG == 32 || defined(__KERNEL__)
#ifndef F_GETLK64 #ifndef F_GETLK64
#define F_GETLK64 12 /* using 'struct flock64' */ #define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13 #define F_SETLK64 13
#define F_SETLKW64 14 #define F_SETLKW64 14
#endif #endif
#endif #endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */
#ifndef F_SETOWN_EX #ifndef F_SETOWN_EX
#define F_SETOWN_EX 15 #define F_SETOWN_EX 15
......
...@@ -115,13 +115,11 @@ ...@@ -115,13 +115,11 @@
#define F_GETSIG 11 /* for sockets. */ #define F_GETSIG 11 /* for sockets. */
#endif #endif
#ifndef CONFIG_64BIT
#ifndef F_GETLK64 #ifndef F_GETLK64
#define F_GETLK64 12 /* using 'struct flock64' */ #define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13 #define F_SETLK64 13
#define F_SETLKW64 14 #define F_SETLKW64 14
#endif #endif
#endif
#ifndef F_SETOWN_EX #ifndef F_SETOWN_EX
#define F_SETOWN_EX 15 #define F_SETOWN_EX 15
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment