Unverified Commit 3ce0f237 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Palmer Dabbelt
Browse files

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: 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>
Acked-by: Helge Deller <deller@gmx.de>  # parisc
Link: https://lore.kernel.org/r/20220405071314.3225832-4-guoren@kernel.org


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

arch/arm64/include/asm/compat.h

+0 −16
Original line number Diff line number Diff line
@@ -65,22 +65,6 @@ struct compat_stat { 
	compat_ulong_t	__unused4[2];

};



struct compat_flock {

	short		l_type;

	short		l_whence;

	compat_off_t	l_start;

	compat_off_t	l_len;

	compat_pid_t	l_pid;

};



struct compat_flock64 {

	short		l_type;

	short		l_whence;

	compat_loff_t	l_start;

	compat_loff_t	l_len;

	compat_pid_t	l_pid;

};



struct compat_statfs {

	int		f_type;

	int		f_bsize;

arch/mips/include/asm/compat.h

+2 −17
Original line number Diff line number Diff line
@@ -55,23 +55,8 @@ struct compat_stat { 
	s32		st_pad4[14];

};



struct compat_flock {

	short		l_type;

	short		l_whence;

	compat_off_t	l_start;

	compat_off_t	l_len;

	s32		l_sysid;

	compat_pid_t	l_pid;

	s32		pad[4];

};



struct compat_flock64 {

	short		l_type;

	short		l_whence;

	compat_loff_t	l_start;

	compat_loff_t	l_len;

	compat_pid_t	l_pid;

};

#define __ARCH_COMPAT_FLOCK_EXTRA_SYSID		s32 l_sysid;

#define __ARCH_COMPAT_FLOCK_PAD			s32 pad[4];



struct compat_statfs {

	int		f_type;

arch/parisc/include/asm/compat.h

+0 −16
Original line number Diff line number Diff line
@@ -53,22 +53,6 @@ struct compat_stat { 
	u32			st_spare4[3];

};



struct compat_flock {

	short			l_type;

	short			l_whence;

	compat_off_t		l_start;

	compat_off_t		l_len;

	compat_pid_t		l_pid;

};



struct compat_flock64 {

	short			l_type;

	short			l_whence;

	compat_loff_t		l_start;

	compat_loff_t		l_len;

	compat_pid_t		l_pid;

};



struct compat_statfs {

	s32		f_type;

	s32		f_bsize;

arch/powerpc/include/asm/compat.h

+0 −16
Original line number Diff line number Diff line
@@ -44,22 +44,6 @@ struct compat_stat { 
	u32		__unused4[2];

};



struct compat_flock {

	short		l_type;

	short		l_whence;

	compat_off_t	l_start;

	compat_off_t	l_len;

	compat_pid_t	l_pid;

};



struct compat_flock64 {

	short		l_type;

	short		l_whence;

	compat_loff_t	l_start;

	compat_loff_t	l_len;

	compat_pid_t	l_pid;

};



struct compat_statfs {

	int		f_type;

	int		f_bsize;

arch/s390/include/asm/compat.h

+0 −16
Original line number Diff line number Diff line
@@ -102,22 +102,6 @@ struct compat_stat { 
	u32		__unused5;

};



struct compat_flock {

	short		l_type;

	short		l_whence;

	compat_off_t	l_start;

	compat_off_t	l_len;

	compat_pid_t	l_pid;

};



struct compat_flock64 {

	short		l_type;

	short		l_whence;

	compat_loff_t	l_start;

	compat_loff_t	l_len;

	compat_pid_t	l_pid;

};



struct compat_statfs {

	u32		f_type;

	u32		f_bsize;