Re: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
On Tue, Feb 01, 2022 at 09:16:27AM +0800, Guo Ren wrote: > Right? > > Seems you've based on an old tree, right? This was a fairly recent Linus tree. I don't have the tree at hand right now due to travel, but what changed there recently?
Re: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
This patch should be: diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h index ecd0f5bdfc1d..220ae6d32e7b 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -193,32 +193,28 @@ 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; +#ifdef __ARCH_FLOCK_PAD __ARCH_FLOCK_PAD -}; #endif - -#ifndef HAVE_ARCH_STRUCT_FLOCK64 -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD +} #endif +#ifndef HAVE_ARCH_STRUCT_FLOCK64 struct flock64 { short l_type; short l_whence; __kernel_loff_t l_start; __kernel_loff_t l_len; __kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK64_PAD __ARCH_FLOCK64_PAD +#endif }; Right? Seems you've based on an old tree, right? On Mon, Jan 31, 2022 at 2:49 PM Christoph Hellwig wrote: > > Signed-off-by: Christoph Hellwig > --- > include/uapi/asm-generic/fcntl.h | 2 -- > tools/include/uapi/asm-generic/fcntl.h | 2 -- > 2 files changed, 4 deletions(-) > > diff --git a/include/uapi/asm-generic/fcntl.h > b/include/uapi/asm-generic/fcntl.h > index ecd0f5bdfc1d6..caa482e3b01af 100644 > --- a/include/uapi/asm-generic/fcntl.h > +++ b/include/uapi/asm-generic/fcntl.h > @@ -207,7 +207,6 @@ struct flock { > }; > #endif > > -#ifndef HAVE_ARCH_STRUCT_FLOCK64 > #ifndef __ARCH_FLOCK64_PAD > #define __ARCH_FLOCK64_PAD > #endif > @@ -220,6 +219,5 @@ struct flock64 { > __kernel_pid_t l_pid; > __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 ac190958c9814..4a49d33ca4d55 100644 > --- a/tools/include/uapi/asm-generic/fcntl.h > +++ b/tools/include/uapi/asm-generic/fcntl.h > @@ -202,7 +202,6 @@ struct flock { > }; > #endif > > -#ifndef HAVE_ARCH_STRUCT_FLOCK64 > #ifndef __ARCH_FLOCK64_PAD > #define __ARCH_FLOCK64_PAD > #endif > @@ -215,6 +214,5 @@ struct flock64 { > __kernel_pid_t l_pid; > __ARCH_FLOCK64_PAD > }; > -#endif > > #endif /* _ASM_GENERIC_FCNTL_H */ > -- > 2.30.2 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
Reviewed-by: Guo Ren On Mon, Jan 31, 2022 at 2:49 PM Christoph Hellwig wrote: > > Signed-off-by: Christoph Hellwig > --- > include/uapi/asm-generic/fcntl.h | 2 -- > tools/include/uapi/asm-generic/fcntl.h | 2 -- > 2 files changed, 4 deletions(-) > > diff --git a/include/uapi/asm-generic/fcntl.h > b/include/uapi/asm-generic/fcntl.h > index ecd0f5bdfc1d6..caa482e3b01af 100644 > --- a/include/uapi/asm-generic/fcntl.h > +++ b/include/uapi/asm-generic/fcntl.h > @@ -207,7 +207,6 @@ struct flock { > }; > #endif > > -#ifndef HAVE_ARCH_STRUCT_FLOCK64 > #ifndef __ARCH_FLOCK64_PAD > #define __ARCH_FLOCK64_PAD > #endif > @@ -220,6 +219,5 @@ struct flock64 { > __kernel_pid_t l_pid; > __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 ac190958c9814..4a49d33ca4d55 100644 > --- a/tools/include/uapi/asm-generic/fcntl.h > +++ b/tools/include/uapi/asm-generic/fcntl.h > @@ -202,7 +202,6 @@ struct flock { > }; > #endif > > -#ifndef HAVE_ARCH_STRUCT_FLOCK64 > #ifndef __ARCH_FLOCK64_PAD > #define __ARCH_FLOCK64_PAD > #endif > @@ -215,6 +214,5 @@ struct flock64 { > __kernel_pid_t l_pid; > __ARCH_FLOCK64_PAD > }; > -#endif > > #endif /* _ASM_GENERIC_FCNTL_H */ > -- > 2.30.2 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
[PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
Signed-off-by: Christoph Hellwig --- include/uapi/asm-generic/fcntl.h | 2 -- tools/include/uapi/asm-generic/fcntl.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h index ecd0f5bdfc1d6..caa482e3b01af 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -207,7 +207,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -220,6 +219,5 @@ struct flock64 { __kernel_pid_t l_pid; __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 ac190958c9814..4a49d33ca4d55 100644 --- a/tools/include/uapi/asm-generic/fcntl.h +++ b/tools/include/uapi/asm-generic/fcntl.h @@ -202,7 +202,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -215,6 +214,5 @@ struct flock64 { __kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ -- 2.30.2
[PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
Signed-off-by: Christoph Hellwig --- include/uapi/asm-generic/fcntl.h | 2 -- tools/include/uapi/asm-generic/fcntl.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h index ecd0f5bdfc1d6..caa482e3b01af 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -207,7 +207,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -220,6 +219,5 @@ struct flock64 { __kernel_pid_t l_pid; __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 ac190958c9814..4a49d33ca4d55 100644 --- a/tools/include/uapi/asm-generic/fcntl.h +++ b/tools/include/uapi/asm-generic/fcntl.h @@ -202,7 +202,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -215,6 +214,5 @@ struct flock64 { __kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ -- 2.30.2
Re: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
Hi Arnd, On Mon, 12 Apr 2021 11:55:41 +0200 Arnd Bergmann wrote: > > On Mon, Apr 12, 2021 at 10:55 AM Christoph Hellwig wrote: > > > > Signed-off-by: Christoph Hellwig > > The patch looks good, but I'd like to see a description for each one. > How about: > > | The check was added when Stephen Rothwell created the file, but > | no architecture ever defined it. Actually it was used by the xtensa architecture until Dec, 2006. -- Cheers, Stephen Rothwell pgpI0dRUn4tC3.pgp Description: OpenPGP digital signature
Re: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
On Mon, Apr 12, 2021 at 10:55 AM Christoph Hellwig wrote: > > Signed-off-by: Christoph Hellwig The patch looks good, but I'd like to see a description for each one. How about: | The check was added when Stephen Rothwell created the file, but | no architecture ever defined it. Arnd
[PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define
Signed-off-by: Christoph Hellwig --- include/uapi/asm-generic/fcntl.h | 2 -- tools/include/uapi/asm-generic/fcntl.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h index 9dc0bf0c5a6ee8..fb454bb629d114 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -203,7 +203,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -216,6 +215,5 @@ struct flock64 { __kernel_pid_t l_pid; __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 ac190958c98144..4a49d33ca4d55d 100644 --- a/tools/include/uapi/asm-generic/fcntl.h +++ b/tools/include/uapi/asm-generic/fcntl.h @@ -202,7 +202,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -215,6 +214,5 @@ struct flock64 { __kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ -- 2.30.1