aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-06 18:18:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 19:57:38 -0400
commit5ac353f9baf7169298ebb7de86b2d697b25bca44 (patch)
tree2591e241e07c96d19db85d418ff6623ec394f984 /include/asm-generic
parent1abf62afb6e9cdc1b2618b69067a186b94281587 (diff)
[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>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/fcntl.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index 1e66f923a252..b001d7fe0384 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -1,6 +1,8 @@
1#ifndef _ASM_GENERIC_FCNTL_H 1#ifndef _ASM_GENERIC_FCNTL_H
2#define _ASM_GENERIC_FCNTL_H 2#define _ASM_GENERIC_FCNTL_H
3 3
4#include <linux/types.h>
5
4/* open/fcntl - O_SYNC is only implemented on blocks devices and on files 6/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
5 located on an ext2 file system */ 7 located on an ext2 file system */
6#define O_ACCMODE 00000003 8#define O_ACCMODE 00000003
@@ -104,4 +106,19 @@
104 106
105#define F_LINUX_SPECIFIC_BASE 1024 107#define F_LINUX_SPECIFIC_BASE 1024
106 108
109#ifndef HAVE_ARCH_STRUCT_FLOCK
110#ifndef __ARCH_FLOCK_PAD
111#define __ARCH_FLOCK_PAD
112#endif
113
114struct flock {
115 short l_type;
116 short l_whence;
117 off_t l_start;
118 off_t l_len;
119 pid_t l_pid;
120 __ARCH_FLOCK_PAD
121};
122#endif
123
107#endif /* _ASM_GENERIC_FCNTL_H */ 124#endif /* _ASM_GENERIC_FCNTL_H */