[PATCH] Clean up struct flock definitions

This patch just gathers together all the struct flock definitions except
xtensa into asm-generic/fcntl.h.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Stephen Rothwell
2005-09-06 15:18:00 -07:00
committed by Linus Torvalds
parent 1abf62afb6
commit 5ac353f9ba
21 changed files with 26 additions and 171 deletions

View File

@ -50,7 +50,7 @@ struct flock {
long l_sysid;
__kernel_pid_t l_pid;
long pad[4];
} flock_t;
};
typedef struct flock64 {
short l_type;
@ -60,22 +60,13 @@ typedef struct flock64 {
pid_t l_pid;
} flock64_t;
#else /* 64-bit definitions */
typedef struct flock {
short l_type;
short l_whence;
__kernel_off_t l_start;
__kernel_off_t l_len;
__kernel_pid_t l_pid;
} flock_t;
#ifdef __KERNEL__
#define flock64 flock
#endif
#define HAVE_ARCH_STRUCT_FLOCK
#endif
#include <asm-generic/fcntl.h>
typedef struct flock flock_t;
#endif /* _ASM_FCNTL_H */