niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

uapi: simplify __ARCH_FLOCK{,64}_PAD a little

Browse source 
Don't bother to define the symbols empty, just don't use them.
That makes the intent a little more clear.

Remove the unused HAVE_ARCH_STRUCT_FLOCK64 define and merge the
32-bit mips struct flock into the generic one.

Add a new __ARCH_FLOCK_EXTRA_SYSID macro following the style of
__ARCH_FLOCK_PAD to avoid having a separate definition just for
one architecture.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20220405071314.3225832-2-guoren@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Christoph Hellwig 2022-04-05 15:12:55 +08:00 • committed by Palmer Dabbelt
parent 3123109284
commit 9f79b8b723
No known key found for this signature in database
GPG key ID: 2E1319F35FBB1889
3 changed files with 17 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
arch/mips/include/uapi/asm/fcntl.h
View file

@ -50,30 +50,10 @@
#define F_SETLKW64 35 #define F_SETLKW64 35
#endif #endif
/*
* The flavours of struct flock. "struct flock" is the ABI compliant
* variant. Finally struct flock64 is the LFS variant of struct flock. As
* a historic accident and inconsistence with the ABI definition it doesn't
* contain all the same fields as struct flock.
*/
#if _MIPS_SIM != _MIPS_SIM_ABI64 #if _MIPS_SIM != _MIPS_SIM_ABI64
#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid;
#include <linux/types.h> #define __ARCH_FLOCK_PAD long pad[4];
#endif
struct flock {
short l_type;
short l_whence;
__kernel_off_t l_start;
__kernel_off_t l_len;
long l_sysid;
__kernel_pid_t l_pid;
long pad[4];
};
#define HAVE_ARCH_STRUCT_FLOCK
#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
#include <asm-generic/fcntl.h> #include <asm-generic/fcntl.h>

19
include/uapi/asm-generic/fcntl.h
View file

@ -192,25 +192,19 @@ struct f_owner_ex {
#define F_LINUX_SPECIFIC_BASE 1024 #define F_LINUX_SPECIFIC_BASE 1024
#ifndef HAVE_ARCH_STRUCT_FLOCK
#ifndef __ARCH_FLOCK_PAD
#define __ARCH_FLOCK_PAD
#endif
struct flock { struct flock {
short l_type; short l_type;
short l_whence; short l_whence;
__kernel_off_t l_start; __kernel_off_t l_start;
__kernel_off_t l_len; __kernel_off_t l_len;
__kernel_pid_t l_pid; __kernel_pid_t l_pid;
#ifdef __ARCH_FLOCK_EXTRA_SYSID
__ARCH_FLOCK_EXTRA_SYSID
#endif
#ifdef __ARCH_FLOCK_PAD
__ARCH_FLOCK_PAD __ARCH_FLOCK_PAD
#endif
}; };
#endif
#ifndef HAVE_ARCH_STRUCT_FLOCK64
#ifndef __ARCH_FLOCK64_PAD
#define __ARCH_FLOCK64_PAD
#endif
struct flock64 { struct flock64 {
short l_type; short l_type;
@ -218,8 +212,9 @@ struct flock64 {
__kernel_loff_t l_start; __kernel_loff_t l_start;
__kernel_loff_t l_len; __kernel_loff_t l_len;
__kernel_pid_t l_pid; __kernel_pid_t l_pid;
#ifdef __ARCH_FLOCK64_PAD
__ARCH_FLOCK64_PAD __ARCH_FLOCK64_PAD
};
#endif #endif
};
#endif /* _ASM_GENERIC_FCNTL_H */ #endif /* _ASM_GENERIC_FCNTL_H */

19
tools/include/uapi/asm-generic/fcntl.h
View file

@ -187,25 +187,19 @@ struct f_owner_ex {
#define F_LINUX_SPECIFIC_BASE 1024 #define F_LINUX_SPECIFIC_BASE 1024
#ifndef HAVE_ARCH_STRUCT_FLOCK
#ifndef __ARCH_FLOCK_PAD
#define __ARCH_FLOCK_PAD
#endif
struct flock { struct flock {
short l_type; short l_type;
short l_whence; short l_whence;
__kernel_off_t l_start; __kernel_off_t l_start;
__kernel_off_t l_len; __kernel_off_t l_len;
__kernel_pid_t l_pid; __kernel_pid_t l_pid;
#ifdef __ARCH_FLOCK_EXTRA_SYSID
__ARCH_FLOCK_EXTRA_SYSID
#endif
#ifdef __ARCH_FLOCK_PAD
__ARCH_FLOCK_PAD __ARCH_FLOCK_PAD
#endif
}; };
#endif
#ifndef HAVE_ARCH_STRUCT_FLOCK64
#ifndef __ARCH_FLOCK64_PAD
#define __ARCH_FLOCK64_PAD
#endif
struct flock64 { struct flock64 {
short l_type; short l_type;
@ -213,8 +207,9 @@ struct flock64 {
__kernel_loff_t l_start; __kernel_loff_t l_start;
__kernel_loff_t l_len; __kernel_loff_t l_len;
__kernel_pid_t l_pid; __kernel_pid_t l_pid;
#ifdef __ARCH_FLOCK64_PAD
__ARCH_FLOCK64_PAD __ARCH_FLOCK64_PAD
};
#endif #endif
};
#endif /* _ASM_GENERIC_FCNTL_H */ #endif /* _ASM_GENERIC_FCNTL_H */