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.
Unified · Split
| @@ -50,30 +50,10 @@ · 49 unmodified lines | |||
| 50 | #define F_SETLKW64 35 | 50 | #define F_SETLKW64 35 |
| 51 | #endif | 51 | #endif |
| 52 | 52 | ||
| 53 | /* | ||
| 54 | * The flavours of struct flock. "struct flock" is the ABI compliant | ||
| 55 | * variant. Finally struct flock64 is the LFS variant of struct flock. As | ||
| 56 | * a historic accident and inconsistence with the ABI definition it doesn't | ||
| 57 | * contain all the same fields as struct flock. | ||
| 58 | */ | ||
| 59 | |||
| 60 | #if _MIPS_SIM != _MIPS_SIM_ABI64 | 53 | #if _MIPS_SIM != _MIPS_SIM_ABI64 |
| 61 | 54 | #define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; | |
| 62 | #include <linux/types.h> | 55 | #define __ARCH_FLOCK_PAD long pad[4]; |
| 63 | 56 | #endif | |
| 64 | struct flock { | ||
| 65 | short l_type; | ||
| 66 | short l_whence; | ||
| 67 | __kernel_off_t l_start; | ||
| 68 | __kernel_off_t l_len; | ||
| 69 | long l_sysid; | ||
| 70 | __kernel_pid_t l_pid; | ||
| 71 | long pad[4]; | ||
| 72 | }; | ||
| 73 | |||
| 74 | #define HAVE_ARCH_STRUCT_FLOCK | ||
| 75 | |||
| 76 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | ||
| 77 | 57 | ||
| 78 | #include <asm-generic/fcntl.h> | 58 | #include <asm-generic/fcntl.h> |
| 79 | 59 | ||
| @@ -192,25 +192,19 @@ struct f_owner_ex { · 191 unmodified lines | |||
| 192 | 192 | ||
| 193 | #define F_LINUX_SPECIFIC_BASE 1024 | 193 | #define F_LINUX_SPECIFIC_BASE 1024 |
| 194 | 194 | ||
| 195 | #ifndef HAVE_ARCH_STRUCT_FLOCK | ||
| 196 | #ifndef __ARCH_FLOCK_PAD | ||
| 197 | #define __ARCH_FLOCK_PAD | ||
| 198 | #endif | ||
| 199 | |||
| 200 | struct flock { | 195 | struct flock { |
| 201 | short l_type; | 196 | short l_type; |
| 202 | short l_whence; | 197 | short l_whence; |
| 203 | __kernel_off_t l_start; | 198 | __kernel_off_t l_start; |
| 204 | __kernel_off_t l_len; | 199 | __kernel_off_t l_len; |
| 205 | __kernel_pid_t l_pid; | 200 | __kernel_pid_t l_pid; |
| 206 | __ARCH_FLOCK_PAD | 201 | #ifdef __ARCH_FLOCK_EXTRA_SYSID |
| 207 | }; | 202 | __ARCH_FLOCK_EXTRA_SYSID |
| 208 | #endif | 203 | #endif |
| 209 | 204 | #ifdef __ARCH_FLOCK_PAD | |
| 210 | #ifndef HAVE_ARCH_STRUCT_FLOCK64 | 205 | __ARCH_FLOCK_PAD |
| 211 | #ifndef __ARCH_FLOCK64_PAD | ||
| 212 | #define __ARCH_FLOCK64_PAD | ||
| 213 | #endif | 206 | #endif |
| 207 | }; | ||
| 214 | 208 | ||
| 215 | struct flock64 { | 209 | struct flock64 { |
| 216 | short l_type; | 210 | short l_type; |
| @@ -218,8 +212,9 @@ struct flock64 { · 1 unmodified line | |||
| 218 | __kernel_loff_t l_start; | 212 | __kernel_loff_t l_start; |
| 219 | __kernel_loff_t l_len; | 213 | __kernel_loff_t l_len; |
| 220 | __kernel_pid_t l_pid; | 214 | __kernel_pid_t l_pid; |
| 215 | #ifdef __ARCH_FLOCK64_PAD | ||
| 221 | __ARCH_FLOCK64_PAD | 216 | __ARCH_FLOCK64_PAD |
| 222 | }; | ||
| 223 | #endif | 217 | #endif |
| 218 | }; | ||
| 224 | 219 | ||
| 225 | #endif /* _ASM_GENERIC_FCNTL_H */ | 220 | #endif /* _ASM_GENERIC_FCNTL_H */ |
| @@ -187,25 +187,19 @@ struct f_owner_ex { · 186 unmodified lines | |||
| 187 | 187 | ||
| 188 | #define F_LINUX_SPECIFIC_BASE 1024 | 188 | #define F_LINUX_SPECIFIC_BASE 1024 |
| 189 | 189 | ||
| 190 | #ifndef HAVE_ARCH_STRUCT_FLOCK | ||
| 191 | #ifndef __ARCH_FLOCK_PAD | ||
| 192 | #define __ARCH_FLOCK_PAD | ||
| 193 | #endif | ||
| 194 | |||
| 195 | struct flock { | 190 | struct flock { |
| 196 | short l_type; | 191 | short l_type; |
| 197 | short l_whence; | 192 | short l_whence; |
| 198 | __kernel_off_t l_start; | 193 | __kernel_off_t l_start; |
| 199 | __kernel_off_t l_len; | 194 | __kernel_off_t l_len; |
| 200 | __kernel_pid_t l_pid; | 195 | __kernel_pid_t l_pid; |
| 201 | __ARCH_FLOCK_PAD | 196 | #ifdef __ARCH_FLOCK_EXTRA_SYSID |
| 202 | }; | 197 | __ARCH_FLOCK_EXTRA_SYSID |
| 203 | #endif | 198 | #endif |
| 204 | 199 | #ifdef __ARCH_FLOCK_PAD | |
| 205 | #ifndef HAVE_ARCH_STRUCT_FLOCK64 | 200 | __ARCH_FLOCK_PAD |
| 206 | #ifndef __ARCH_FLOCK64_PAD | ||
| 207 | #define __ARCH_FLOCK64_PAD | ||
| 208 | #endif | 201 | #endif |
| 202 | }; | ||
| 209 | 203 | ||
| 210 | struct flock64 { | 204 | struct flock64 { |
| 211 | short l_type; | 205 | short l_type; |
| @@ -213,8 +207,9 @@ struct flock64 { · 1 unmodified line | |||
| 213 | __kernel_loff_t l_start; | 207 | __kernel_loff_t l_start; |
| 214 | __kernel_loff_t l_len; | 208 | __kernel_loff_t l_len; |
| 215 | __kernel_pid_t l_pid; | 209 | __kernel_pid_t l_pid; |
| 210 | #ifdef __ARCH_FLOCK64_PAD | ||
| 216 | __ARCH_FLOCK64_PAD | 211 | __ARCH_FLOCK64_PAD |
| 217 | }; | ||
| 218 | #endif | 212 | #endif |
| 213 | }; | ||
| 219 | 214 | ||
| 220 | #endif /* _ASM_GENERIC_FCNTL_H */ | 215 | #endif /* _ASM_GENERIC_FCNTL_H */ |