aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/fcntl.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-06 18:18:01 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 19:57:38 -0400
commit8d286aa5eaf951bf53d4a0f64576d4b377c435ba (patch)
treec2304e6fc3af25b6a09f974fa09db753f6bd8cea /include/asm-sparc/fcntl.h
parent5ac353f9baf7169298ebb7de86b2d697b25bca44 (diff)
[PATCH] Clean up struct flock64 definitions
This patch gathers all the struct flock64 definitions (and the operations), puts them under !CONFIG_64BIT and cleans up the arch files. 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-sparc/fcntl.h')
-rw-r--r--include/asm-sparc/fcntl.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index 634557374e95..5db60b5ae7b0 100644
--- a/include/asm-sparc/fcntl.h
+++ b/include/asm-sparc/fcntl.h
@@ -23,25 +23,13 @@
23#define F_SETLK 8 23#define F_SETLK 8
24#define F_SETLKW 9 24#define F_SETLKW 9
25 25
26#define F_GETLK64 12 /* using 'struct flock64' */
27#define F_SETLK64 13
28#define F_SETLKW64 14
29
30/* for posix fcntl() and lockf() */ 26/* for posix fcntl() and lockf() */
31#define F_RDLCK 1 27#define F_RDLCK 1
32#define F_WRLCK 2 28#define F_WRLCK 2
33#define F_UNLCK 3 29#define F_UNLCK 3
34 30
35struct flock64 {
36 short l_type;
37 short l_whence;
38 loff_t l_start;
39 loff_t l_len;
40 pid_t l_pid;
41 short __unused;
42};
43
44#define __ARCH_FLOCK_PAD short __unused; 31#define __ARCH_FLOCK_PAD short __unused;
32#define __ARCH_FLOCK64_PAD short __unused;
45 33
46#include <asm-generic/fcntl.h> 34#include <asm-generic/fcntl.h>
47 35