From: guoren@kernel.org
To: guoren@kernel.org, palmer@dabbelt.com, arnd@arndb.de,
gregkh@linuxfoundation.org, hch@lst.de
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-riscv@lists.infradead.org, linux-csky@vger.kernel.org,
linux-s390@vger.kernel.org, sparclinux@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-parisc@vger.kernel.org,
linux-mips@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
x86@kernel.org, heiko@sntech.de
Subject: [PATCH V9 01/20] uapi: simplify __ARCH_FLOCK{,64}_PAD a little
Date: Tue, 22 Mar 2022 22:39:44 +0800 [thread overview]
Message-ID: <20220322144003.2357128-2-guoren@kernel.org> (raw)
In-Reply-To: <20220322144003.2357128-1-guoren@kernel.org>
From: Christoph Hellwig <hch@lst.de>
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>
---
arch/mips/include/uapi/asm/fcntl.h | 26 +++-----------------------
include/uapi/asm-generic/fcntl.h | 19 +++++++------------
tools/include/uapi/asm-generic/fcntl.h | 19 +++++++------------
3 files changed, 17 insertions(+), 47 deletions(-)
diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h
index 42e13dead543..9e44ac810db9 100644
--- a/arch/mips/include/uapi/asm/fcntl.h
+++ b/arch/mips/include/uapi/asm/fcntl.h
@@ -50,30 +50,10 @@
#define F_SETLKW64 35
#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
-
-#include <linux/types.h>
-
-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 */
+#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid;
+#define __ARCH_FLOCK_PAD long pad[4];
+#endif
#include <asm-generic/fcntl.h>
diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
index ecd0f5bdfc1d..77aa9f2ff98d 100644
--- a/include/uapi/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
@@ -192,25 +192,19 @@ struct f_owner_ex {
#define F_LINUX_SPECIFIC_BASE 1024
-#ifndef HAVE_ARCH_STRUCT_FLOCK
-#ifndef __ARCH_FLOCK_PAD
-#define __ARCH_FLOCK_PAD
-#endif
-
struct flock {
short l_type;
short l_whence;
__kernel_off_t l_start;
__kernel_off_t l_len;
__kernel_pid_t l_pid;
- __ARCH_FLOCK_PAD
-};
+#ifdef __ARCH_FLOCK_EXTRA_SYSID
+ __ARCH_FLOCK_EXTRA_SYSID
#endif
-
-#ifndef HAVE_ARCH_STRUCT_FLOCK64
-#ifndef __ARCH_FLOCK64_PAD
-#define __ARCH_FLOCK64_PAD
+#ifdef __ARCH_FLOCK_PAD
+ __ARCH_FLOCK_PAD
#endif
+};
struct flock64 {
short l_type;
@@ -218,8 +212,9 @@ struct flock64 {
__kernel_loff_t l_start;
__kernel_loff_t l_len;
__kernel_pid_t l_pid;
+#ifdef __ARCH_FLOCK64_PAD
__ARCH_FLOCK64_PAD
-};
#endif
+};
#endif /* _ASM_GENERIC_FCNTL_H */
diff --git a/tools/include/uapi/asm-generic/fcntl.h b/tools/include/uapi/asm-generic/fcntl.h
index ac190958c981..99bc9b15ce2b 100644
--- a/tools/include/uapi/asm-generic/fcntl.h
+++ b/tools/include/uapi/asm-generic/fcntl.h
@@ -187,25 +187,19 @@ struct f_owner_ex {
#define F_LINUX_SPECIFIC_BASE 1024
-#ifndef HAVE_ARCH_STRUCT_FLOCK
-#ifndef __ARCH_FLOCK_PAD
-#define __ARCH_FLOCK_PAD
-#endif
-
struct flock {
short l_type;
short l_whence;
__kernel_off_t l_start;
__kernel_off_t l_len;
__kernel_pid_t l_pid;
- __ARCH_FLOCK_PAD
-};
+#ifdef __ARCH_FLOCK_EXTRA_SYSID
+ __ARCH_FLOCK_EXTRA_SYSID
#endif
-
-#ifndef HAVE_ARCH_STRUCT_FLOCK64
-#ifndef __ARCH_FLOCK64_PAD
-#define __ARCH_FLOCK64_PAD
+#ifdef __ARCH_FLOCK_PAD
+ __ARCH_FLOCK_PAD
#endif
+};
struct flock64 {
short l_type;
@@ -213,8 +207,9 @@ struct flock64 {
__kernel_loff_t l_start;
__kernel_loff_t l_len;
__kernel_pid_t l_pid;
+#ifdef __ARCH_FLOCK64_PAD
__ARCH_FLOCK64_PAD
-};
#endif
+};
#endif /* _ASM_GENERIC_FCNTL_H */
--
2.25.1
next prev parent reply other threads:[~2022-03-22 14:40 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 14:39 [PATCH V9 00/20] riscv: compat: Add COMPAT Kbuild skeletal support guoren
2022-03-22 14:39 ` guoren [this message]
2022-03-22 14:39 ` [PATCH V9 02/20] uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h guoren
2022-03-22 14:39 ` [PATCH V9 03/20] compat: consolidate the compat_flock{,64} definition guoren
2022-03-22 14:39 ` [PATCH V9 04/20] kconfig: Add SYSVIPC_COMPAT for all architectures guoren
2022-03-22 14:39 ` [PATCH V9 05/20] fs: stat: compat: Add __ARCH_WANT_COMPAT_STAT guoren
2022-03-22 14:39 ` [PATCH V9 06/20] asm-generic: compat: Cleanup duplicate definitions guoren
2022-03-22 14:39 ` [PATCH V9 07/20] syscalls: compat: Fix the missing part for __SYSCALL_COMPAT guoren
2022-03-22 14:39 ` [PATCH V9 08/20] riscv: Fixup difference with defconfig guoren
2022-03-22 14:39 ` [PATCH V9 09/20] riscv: compat: Add basic compat data type implementation guoren
2022-03-22 14:39 ` [PATCH V9 10/20] riscv: compat: Re-implement TASK_SIZE for COMPAT_32BIT guoren
2022-03-22 14:39 ` [PATCH V9 11/20] riscv: compat: syscall: Add compat_sys_call_table implementation guoren
2022-03-23 13:40 ` Guo Ren
2022-03-22 14:39 ` [PATCH V9 12/20] riscv: compat: syscall: Add entry.S implementation guoren
2022-03-22 14:39 ` [PATCH V9 13/20] riscv: compat: process: Add UXL_32 support in start_thread guoren
2022-03-22 14:39 ` [PATCH V9 14/20] riscv: compat: Add elf.h implementation guoren
2022-03-22 14:39 ` [PATCH V9 15/20] riscv: compat: Add hw capability check for elf guoren
2022-03-22 14:39 ` [PATCH V9 16/20] riscv: compat: vdso: Add COMPAT_VDSO base code implementation guoren
2022-03-22 14:40 ` [PATCH V9 17/20] riscv: compat: vdso: Add setup additional pages implementation guoren
2022-03-22 14:40 ` [PATCH V9 18/20] riscv: compat: signal: Add rt_frame implementation guoren
2022-03-22 14:40 ` [PATCH V9 19/20] riscv: compat: ptrace: Add compat_arch_ptrace implement guoren
2022-03-22 14:40 ` [PATCH V9 20/20] riscv: compat: Add COMPAT Kbuild skeletal support guoren
2022-05-23 5:45 ` Guenter Roeck
2022-05-23 15:18 ` Guo Ren
2022-05-23 16:18 ` Guenter Roeck
2022-05-23 22:40 ` Heiko Stübner
2022-05-23 23:00 ` Guenter Roeck
2022-05-24 14:41 ` Heiko Stübner
2022-05-24 17:42 ` Guo Ren
2022-05-24 17:46 ` Guo Ren
2022-05-24 22:06 ` Guenter Roeck
2022-05-25 10:57 ` Heiko Stübner
2022-05-25 11:10 ` Heiko Stübner
2022-05-25 16:08 ` Guo Ren
2022-05-25 19:37 ` Heiko Stübner
2022-05-26 0:39 ` Guo Ren
2022-03-22 21:00 ` [PATCH V9 00/20] " Palmer Dabbelt
2022-04-02 12:53 ` Guo Ren
2022-04-02 13:16 ` Guo Ren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220322144003.2357128-2-guoren@kernel.org \
--to=guoren@kernel.org \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=heiko@sntech.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=palmer@dabbelt.com \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).