Messages in this thread Patch in this message | | | From | Guo Ren <> | Date | Tue, 1 Feb 2022 09:16:27 +0800 | Subject | 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 <hch@lst.de> wrote: > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > 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/
| |