diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
commit | 467832032cc07626880363efa8625719c16c04eb (patch) | |
tree | ee9a62c04f0b3106e412bc1b2dd1cea5566d5ca7 /include/asm-generic/fcntl.h | |
parent | 66d2a5952eab875f1286e04f738ef029afdaf013 (diff) | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) |
Merge commit 'v2.6.32' into next
Diffstat (limited to 'include/asm-generic/fcntl.h')
-rw-r--r-- | include/asm-generic/fcntl.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index 0c3dd8603927..495dc8af4044 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h | |||
@@ -73,14 +73,23 @@ | |||
73 | #define F_SETSIG 10 /* for sockets. */ | 73 | #define F_SETSIG 10 /* for sockets. */ |
74 | #define F_GETSIG 11 /* for sockets. */ | 74 | #define F_GETSIG 11 /* for sockets. */ |
75 | #endif | 75 | #endif |
76 | |||
77 | #ifndef CONFIG_64BIT | ||
78 | #ifndef F_GETLK64 | ||
79 | #define F_GETLK64 12 /* using 'struct flock64' */ | ||
80 | #define F_SETLK64 13 | ||
81 | #define F_SETLKW64 14 | ||
82 | #endif | ||
83 | #endif | ||
84 | |||
76 | #ifndef F_SETOWN_EX | 85 | #ifndef F_SETOWN_EX |
77 | #define F_SETOWN_EX 12 | 86 | #define F_SETOWN_EX 15 |
78 | #define F_GETOWN_EX 13 | 87 | #define F_GETOWN_EX 16 |
79 | #endif | 88 | #endif |
80 | 89 | ||
81 | #define F_OWNER_TID 0 | 90 | #define F_OWNER_TID 0 |
82 | #define F_OWNER_PID 1 | 91 | #define F_OWNER_PID 1 |
83 | #define F_OWNER_GID 2 | 92 | #define F_OWNER_PGRP 2 |
84 | 93 | ||
85 | struct f_owner_ex { | 94 | struct f_owner_ex { |
86 | int type; | 95 | int type; |
@@ -139,12 +148,6 @@ struct flock { | |||
139 | 148 | ||
140 | #ifndef CONFIG_64BIT | 149 | #ifndef CONFIG_64BIT |
141 | 150 | ||
142 | #ifndef F_GETLK64 | ||
143 | #define F_GETLK64 12 /* using 'struct flock64' */ | ||
144 | #define F_SETLK64 13 | ||
145 | #define F_SETLKW64 14 | ||
146 | #endif | ||
147 | |||
148 | #ifndef HAVE_ARCH_STRUCT_FLOCK64 | 151 | #ifndef HAVE_ARCH_STRUCT_FLOCK64 |
149 | #ifndef __ARCH_FLOCK64_PAD | 152 | #ifndef __ARCH_FLOCK64_PAD |
150 | #define __ARCH_FLOCK64_PAD | 153 | #define __ARCH_FLOCK64_PAD |