uapi: Fixup strace compile error
Subsystems (2)
PATCH v2 1/1 uapi: Fixup strace compile error
From: Guo Ren <[email protected]>
Export F_*64 definitions to userspace permanently. "ifndef" usage made it vailable at all times to the userspace, and this change has actually broken building strace with the latest kernel headers. There could be some debate whether having these F_*64 definitions exposed to the user space 64-bit applications, but it seems that were no harm (as they were exposed already for quite some time), and they are useful at least for strace for compat application tracing purposes.
--- include/uapi/asm-generic/fcntl.h | 2 -- 1 file changed, 2 deletions(-)
include/uapi/asm-generic/fcntl.h +0 -2
@@ -116,13 +116,11 @@#define F_GETSIG 11/* for sockets. */ #endif -#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #ifndef F_SETOWN_EX #define F_SETOWN_EX 15
Signature · 1 line
2.36.1
Quoted 16 lines · On Wed, Aug 03, 2022 at 10:54:48PM -0400, [email protected] wrote:
Export F_*64 definitions to userspace permanently. "ifndef" usage made it vailable at all times to the userspace, and this change has actually broken building strace with the latest kernel headers. There could be some debate whether having these F_*64 definitions exposed to the user space 64-bit applications, but it seems that were no harm (as they were exposed already for quite some time), and they are useful at least for strace for compat application tracing purposes.
Fixes 306f7cc1e9061 "uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h"Signed-off-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Reported-by Eugene Syromiatnikov <[email protected]>Acked-by Palmer Dabbelt <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Heiko Stuebner <[email protected]>
Quoted 3 lines
--- include/uapi/asm-generic/fcntl.h | 2 -- 1 file changed, 2 deletions(-)
Hello,
Is this patch getting merged for 6.1? Will it be included in stable 6.0?
Signature · 7 lines
pozdrawiam / best regards
Wojtek Porczyk
Gramine / Invisible Things Lab
I do not fear computers,
I fear lack of them.
-- Isaac AsimovQuoted 22 lines · Wojtek Porczyk
Quoted 16 lines · On Wed, Aug 03, 2022 at 10:54:48PM -0400, [email protected] wrote:
Export F_*64 definitions to userspace permanently. "ifndef" usage made it vailable at all times to the userspace, and this change has actually broken building strace with the latest kernel headers. There could be some debate whether having these F_*64 definitions exposed to the user space 64-bit applications, but it seems that were no harm (as they were exposed already for quite some time), and they are useful at least for strace for compat application tracing purposes.
Fixes 306f7cc1e9061 "uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h"Signed-off-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Reported-by Eugene Syromiatnikov <[email protected]>Acked-by Palmer Dabbelt <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Heiko Stuebner <[email protected]>Quoted 3 lines
--- include/uapi/asm-generic/fcntl.h | 2 -- 1 file changed, 2 deletions(-)
Quoted 3 lines
Hello,
Is this patch getting merged for 6.1? Will it be included in stable 6.0?
Em... It seems it hasn't been in Arnd's tree for next. It should be in stable 6.0.
Quoted 10 lines
--
pozdrawiam / best regards
Wojtek Porczyk
Gramine / Invisible Things LabI do not fear computers,
I fear lack of them.
-- Isaac Asimov
Signature · 2 lines
Best Regards Guo Ren