summaryrefslogtreecommitdiff
path: root/include/asm-generic/fcntl.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-07 02:18:00 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 03:57:38 +0400
commit5ac353f9baf7169298ebb7de86b2d697b25bca44 (patch)
tree2591e241e07c96d19db85d418ff6623ec394f984 /include/asm-generic/fcntl.h
parent1abf62afb6e9cdc1b2618b69067a186b94281587 (diff)
downloadlinux-5ac353f9baf7169298ebb7de86b2d697b25bca44.tar.xz
[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/fcntl.h')
-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 @@
#ifndef _ASM_GENERIC_FCNTL_H
#define _ASM_GENERIC_FCNTL_H
+#include <linux/types.h>
+
/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
located on an ext2 file system */
#define O_ACCMODE 00000003
@@ -104,4 +106,19 @@
#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;
+ off_t l_start;
+ off_t l_len;
+ pid_t l_pid;
+ __ARCH_FLOCK_PAD
+};
+#endif
+
#endif /* _ASM_GENERIC_FCNTL_H */