mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-24 05:01:03 +02:00
compat: consolidate the compat_flock{,64} definition
Provide a single common definition for the compat_flock and compat_flock64 structures using the same tricks as for the native variants. Another extra define is added for the packing required on x86. 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> Acked-by: Helge Deller <deller@gmx.de> # parisc Link: https://lore.kernel.org/r/20220405071314.3225832-4-guoren@kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
committed by
Palmer Dabbelt
parent
306f7cc1e9
commit
3ce0f2373f
@@ -258,6 +258,37 @@ struct compat_rlimit {
|
||||
compat_ulong_t rlim_max;
|
||||
};
|
||||
|
||||
#ifdef __ARCH_NEED_COMPAT_FLOCK64_PACKED
|
||||
#define __ARCH_COMPAT_FLOCK64_PACK __attribute__((packed))
|
||||
#else
|
||||
#define __ARCH_COMPAT_FLOCK64_PACK
|
||||
#endif
|
||||
|
||||
struct compat_flock {
|
||||
short l_type;
|
||||
short l_whence;
|
||||
compat_off_t l_start;
|
||||
compat_off_t l_len;
|
||||
#ifdef __ARCH_COMPAT_FLOCK_EXTRA_SYSID
|
||||
__ARCH_COMPAT_FLOCK_EXTRA_SYSID
|
||||
#endif
|
||||
compat_pid_t l_pid;
|
||||
#ifdef __ARCH_COMPAT_FLOCK_PAD
|
||||
__ARCH_COMPAT_FLOCK_PAD
|
||||
#endif
|
||||
};
|
||||
|
||||
struct compat_flock64 {
|
||||
short l_type;
|
||||
short l_whence;
|
||||
compat_loff_t l_start;
|
||||
compat_loff_t l_len;
|
||||
compat_pid_t l_pid;
|
||||
#ifdef __ARCH_COMPAT_FLOCK64_PAD
|
||||
__ARCH_COMPAT_FLOCK64_PAD
|
||||
#endif
|
||||
} __ARCH_COMPAT_FLOCK64_PACK;
|
||||
|
||||
struct compat_rusage {
|
||||
struct old_timeval32 ru_utime;
|
||||
struct old_timeval32 ru_stime;
|
||||
|
Reference in New Issue
Block a user