diff options
-rw-r--r-- | include/asm-arm/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-arm26/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-cris/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-frv/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-generic/fcntl.h | 31 | ||||
-rw-r--r-- | include/asm-h8300/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-i386/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-ia64/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-m32r/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-m68k/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-mips/fcntl.h | 12 | ||||
-rw-r--r-- | include/asm-parisc/fcntl.h | 10 | ||||
-rw-r--r-- | include/asm-ppc/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-s390/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-sh/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-sparc/fcntl.h | 9 | ||||
-rw-r--r-- | include/asm-sparc64/fcntl.h | 9 | ||||
-rw-r--r-- | include/asm-v850/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-x86_64/fcntl.h | 21 | ||||
-rw-r--r-- | include/asm-xtensa/fcntl.h | 14 |
20 files changed, 31 insertions, 348 deletions
diff --git a/include/asm-arm/fcntl.h b/include/asm-arm/fcntl.h index fca93693957d..6337df23831f 100644 --- a/include/asm-arm/fcntl.h +++ b/include/asm-arm/fcntl.h | |||
@@ -6,31 +6,10 @@ | |||
6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ | 6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ |
7 | #define O_LARGEFILE 0400000 | 7 | #define O_LARGEFILE 0400000 |
8 | 8 | ||
9 | #define F_GETLK 5 | ||
10 | #define F_SETLK 6 | ||
11 | #define F_SETLKW 7 | ||
12 | |||
13 | #define F_SETOWN 8 /* for sockets. */ | ||
14 | #define F_GETOWN 9 /* for sockets. */ | ||
15 | #define F_SETSIG 10 /* for sockets. */ | ||
16 | #define F_GETSIG 11 /* for sockets. */ | ||
17 | |||
18 | #define F_GETLK64 12 /* using 'struct flock64' */ | 9 | #define F_GETLK64 12 /* using 'struct flock64' */ |
19 | #define F_SETLK64 13 | 10 | #define F_SETLK64 13 |
20 | #define F_SETLKW64 14 | 11 | #define F_SETLKW64 14 |
21 | 12 | ||
22 | /* for posix fcntl() and lockf() */ | ||
23 | #define F_RDLCK 0 | ||
24 | #define F_WRLCK 1 | ||
25 | #define F_UNLCK 2 | ||
26 | |||
27 | /* for old implementation of bsd flock () */ | ||
28 | #define F_EXLCK 4 /* or 3 */ | ||
29 | #define F_SHLCK 8 /* or 4 */ | ||
30 | |||
31 | /* for leases */ | ||
32 | #define F_INPROGRESS 16 | ||
33 | |||
34 | struct flock { | 13 | struct flock { |
35 | short l_type; | 14 | short l_type; |
36 | short l_whence; | 15 | short l_whence; |
diff --git a/include/asm-arm26/fcntl.h b/include/asm-arm26/fcntl.h index 76e44e92632e..2f08302fa8c6 100644 --- a/include/asm-arm26/fcntl.h +++ b/include/asm-arm26/fcntl.h | |||
@@ -8,31 +8,10 @@ | |||
8 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ | 8 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ |
9 | #define O_LARGEFILE 0400000 | 9 | #define O_LARGEFILE 0400000 |
10 | 10 | ||
11 | #define F_GETLK 5 | ||
12 | #define F_SETLK 6 | ||
13 | #define F_SETLKW 7 | ||
14 | |||
15 | #define F_SETOWN 8 /* for sockets. */ | ||
16 | #define F_GETOWN 9 /* for sockets. */ | ||
17 | #define F_SETSIG 10 /* for sockets. */ | ||
18 | #define F_GETSIG 11 /* for sockets. */ | ||
19 | |||
20 | #define F_GETLK64 12 /* using 'struct flock64' */ | 11 | #define F_GETLK64 12 /* using 'struct flock64' */ |
21 | #define F_SETLK64 13 | 12 | #define F_SETLK64 13 |
22 | #define F_SETLKW64 14 | 13 | #define F_SETLKW64 14 |
23 | 14 | ||
24 | /* for posix fcntl() and lockf() */ | ||
25 | #define F_RDLCK 0 | ||
26 | #define F_WRLCK 1 | ||
27 | #define F_UNLCK 2 | ||
28 | |||
29 | /* for old implementation of bsd flock () */ | ||
30 | #define F_EXLCK 4 /* or 3 */ | ||
31 | #define F_SHLCK 8 /* or 4 */ | ||
32 | |||
33 | /* for leases */ | ||
34 | #define F_INPROGRESS 16 | ||
35 | |||
36 | struct flock { | 15 | struct flock { |
37 | short l_type; | 16 | short l_type; |
38 | short l_whence; | 17 | short l_whence; |
diff --git a/include/asm-cris/fcntl.h b/include/asm-cris/fcntl.h index 562bb11b945e..e91b576985d2 100644 --- a/include/asm-cris/fcntl.h +++ b/include/asm-cris/fcntl.h | |||
@@ -1,31 +1,10 @@ | |||
1 | #ifndef _CRIS_FCNTL_H | 1 | #ifndef _CRIS_FCNTL_H |
2 | #define _CRIS_FCNTL_H | 2 | #define _CRIS_FCNTL_H |
3 | 3 | ||
4 | #define F_GETLK 5 | ||
5 | #define F_SETLK 6 | ||
6 | #define F_SETLKW 7 | ||
7 | |||
8 | #define F_SETOWN 8 /* for sockets. */ | ||
9 | #define F_GETOWN 9 /* for sockets. */ | ||
10 | #define F_SETSIG 10 /* for sockets. */ | ||
11 | #define F_GETSIG 11 /* for sockets. */ | ||
12 | |||
13 | #define F_GETLK64 12 /* using 'struct flock64' */ | 4 | #define F_GETLK64 12 /* using 'struct flock64' */ |
14 | #define F_SETLK64 13 | 5 | #define F_SETLK64 13 |
15 | #define F_SETLKW64 14 | 6 | #define F_SETLKW64 14 |
16 | 7 | ||
17 | /* for posix fcntl() and lockf() */ | ||
18 | #define F_RDLCK 0 | ||
19 | #define F_WRLCK 1 | ||
20 | #define F_UNLCK 2 | ||
21 | |||
22 | /* for old implementation of bsd flock () */ | ||
23 | #define F_EXLCK 4 /* or 3 */ | ||
24 | #define F_SHLCK 8 /* or 4 */ | ||
25 | |||
26 | /* for leases */ | ||
27 | #define F_INPROGRESS 16 | ||
28 | |||
29 | struct flock { | 8 | struct flock { |
30 | short l_type; | 9 | short l_type; |
31 | short l_whence; | 10 | short l_whence; |
diff --git a/include/asm-frv/fcntl.h b/include/asm-frv/fcntl.h index 44cae14576e4..e5523669b62e 100644 --- a/include/asm-frv/fcntl.h +++ b/include/asm-frv/fcntl.h | |||
@@ -1,31 +1,10 @@ | |||
1 | #ifndef _ASM_FCNTL_H | 1 | #ifndef _ASM_FCNTL_H |
2 | #define _ASM_FCNTL_H | 2 | #define _ASM_FCNTL_H |
3 | 3 | ||
4 | #define F_GETLK 5 | ||
5 | #define F_SETLK 6 | ||
6 | #define F_SETLKW 7 | ||
7 | |||
8 | #define F_SETOWN 8 /* for sockets. */ | ||
9 | #define F_GETOWN 9 /* for sockets. */ | ||
10 | #define F_SETSIG 10 /* for sockets. */ | ||
11 | #define F_GETSIG 11 /* for sockets. */ | ||
12 | |||
13 | #define F_GETLK64 12 /* using 'struct flock64' */ | 4 | #define F_GETLK64 12 /* using 'struct flock64' */ |
14 | #define F_SETLK64 13 | 5 | #define F_SETLK64 13 |
15 | #define F_SETLKW64 14 | 6 | #define F_SETLKW64 14 |
16 | 7 | ||
17 | /* for posix fcntl() and lockf() */ | ||
18 | #define F_RDLCK 0 | ||
19 | #define F_WRLCK 1 | ||
20 | #define F_UNLCK 2 | ||
21 | |||
22 | /* for old implementation of bsd flock () */ | ||
23 | #define F_EXLCK 4 /* or 3 */ | ||
24 | #define F_SHLCK 8 /* or 4 */ | ||
25 | |||
26 | /* for leases */ | ||
27 | #define F_INPROGRESS 16 | ||
28 | |||
29 | struct flock { | 8 | struct flock { |
30 | short l_type; | 9 | short l_type; |
31 | short l_whence; | 10 | short l_whence; |
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index f3690e73a40f..1e66f923a252 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h | |||
@@ -55,10 +55,41 @@ | |||
55 | #define F_SETFD 2 /* set/clear close_on_exec */ | 55 | #define F_SETFD 2 /* set/clear close_on_exec */ |
56 | #define F_GETFL 3 /* get file->f_flags */ | 56 | #define F_GETFL 3 /* get file->f_flags */ |
57 | #define F_SETFL 4 /* set file->f_flags */ | 57 | #define F_SETFL 4 /* set file->f_flags */ |
58 | #ifndef F_GETLK | ||
59 | #define F_GETLK 5 | ||
60 | #define F_SETLK 6 | ||
61 | #define F_SETLKW 7 | ||
62 | #endif | ||
63 | #ifndef F_SETOWN | ||
64 | #define F_SETOWN 8 /* for sockets. */ | ||
65 | #define F_GETOWN 9 /* for sockets. */ | ||
66 | #endif | ||
67 | #ifndef F_SETSIG | ||
68 | #define F_SETSIG 10 /* for sockets. */ | ||
69 | #define F_GETSIG 11 /* for sockets. */ | ||
70 | #endif | ||
58 | 71 | ||
59 | /* for F_[GET|SET]FL */ | 72 | /* for F_[GET|SET]FL */ |
60 | #define FD_CLOEXEC 1 /* actually anything with low bit set goes */ | 73 | #define FD_CLOEXEC 1 /* actually anything with low bit set goes */ |
61 | 74 | ||
75 | /* for posix fcntl() and lockf() */ | ||
76 | #ifndef F_RDLCK | ||
77 | #define F_RDLCK 0 | ||
78 | #define F_WRLCK 1 | ||
79 | #define F_UNLCK 2 | ||
80 | #endif | ||
81 | |||
82 | /* for old implementation of bsd flock () */ | ||
83 | #ifndef F_EXLCK | ||
84 | #define F_EXLCK 4 /* or 3 */ | ||
85 | #define F_SHLCK 8 /* or 4 */ | ||
86 | #endif | ||
87 | |||
88 | /* for leases */ | ||
89 | #ifndef F_INPROGRESS | ||
90 | #define F_INPROGRESS 16 | ||
91 | #endif | ||
92 | |||
62 | /* operations for bsd flock(), also used by the kernel implementation */ | 93 | /* operations for bsd flock(), also used by the kernel implementation */ |
63 | #define LOCK_SH 1 /* shared lock */ | 94 | #define LOCK_SH 1 /* shared lock */ |
64 | #define LOCK_EX 2 /* exclusive lock */ | 95 | #define LOCK_EX 2 /* exclusive lock */ |
diff --git a/include/asm-h8300/fcntl.h b/include/asm-h8300/fcntl.h index 881af9a1ffb7..805aaa09c717 100644 --- a/include/asm-h8300/fcntl.h +++ b/include/asm-h8300/fcntl.h | |||
@@ -6,31 +6,10 @@ | |||
6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ | 6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ |
7 | #define O_LARGEFILE 0400000 | 7 | #define O_LARGEFILE 0400000 |
8 | 8 | ||
9 | #define F_GETLK 5 | ||
10 | #define F_SETLK 6 | ||
11 | #define F_SETLKW 7 | ||
12 | |||
13 | #define F_SETOWN 8 /* for sockets. */ | ||
14 | #define F_GETOWN 9 /* for sockets. */ | ||
15 | #define F_SETSIG 10 /* for sockets. */ | ||
16 | #define F_GETSIG 11 /* for sockets. */ | ||
17 | |||
18 | #define F_GETLK64 12 /* using 'struct flock64' */ | 9 | #define F_GETLK64 12 /* using 'struct flock64' */ |
19 | #define F_SETLK64 13 | 10 | #define F_SETLK64 13 |
20 | #define F_SETLKW64 14 | 11 | #define F_SETLKW64 14 |
21 | 12 | ||
22 | /* for posix fcntl() and lockf() */ | ||
23 | #define F_RDLCK 0 | ||
24 | #define F_WRLCK 1 | ||
25 | #define F_UNLCK 2 | ||
26 | |||
27 | /* for old implementation of bsd flock () */ | ||
28 | #define F_EXLCK 4 /* or 3 */ | ||
29 | #define F_SHLCK 8 /* or 4 */ | ||
30 | |||
31 | /* for leases */ | ||
32 | #define F_INPROGRESS 16 | ||
33 | |||
34 | struct flock { | 13 | struct flock { |
35 | short l_type; | 14 | short l_type; |
36 | short l_whence; | 15 | short l_whence; |
diff --git a/include/asm-i386/fcntl.h b/include/asm-i386/fcntl.h index 4fa08ffde878..1d06913c3bfd 100644 --- a/include/asm-i386/fcntl.h +++ b/include/asm-i386/fcntl.h | |||
@@ -1,31 +1,10 @@ | |||
1 | #ifndef _I386_FCNTL_H | 1 | #ifndef _I386_FCNTL_H |
2 | #define _I386_FCNTL_H | 2 | #define _I386_FCNTL_H |
3 | 3 | ||
4 | #define F_GETLK 5 | ||
5 | #define F_SETLK 6 | ||
6 | #define F_SETLKW 7 | ||
7 | |||
8 | #define F_SETOWN 8 /* for sockets. */ | ||
9 | #define F_GETOWN 9 /* for sockets. */ | ||
10 | #define F_SETSIG 10 /* for sockets. */ | ||
11 | #define F_GETSIG 11 /* for sockets. */ | ||
12 | |||
13 | #define F_GETLK64 12 /* using 'struct flock64' */ | 4 | #define F_GETLK64 12 /* using 'struct flock64' */ |
14 | #define F_SETLK64 13 | 5 | #define F_SETLK64 13 |
15 | #define F_SETLKW64 14 | 6 | #define F_SETLKW64 14 |
16 | 7 | ||
17 | /* for posix fcntl() and lockf() */ | ||
18 | #define F_RDLCK 0 | ||
19 | #define F_WRLCK 1 | ||
20 | #define F_UNLCK 2 | ||
21 | |||
22 | /* for old implementation of bsd flock () */ | ||
23 | #define F_EXLCK 4 /* or 3 */ | ||
24 | #define F_SHLCK 8 /* or 4 */ | ||
25 | |||
26 | /* for leases */ | ||
27 | #define F_INPROGRESS 16 | ||
28 | |||
29 | struct flock { | 8 | struct flock { |
30 | short l_type; | 9 | short l_type; |
31 | short l_whence; | 10 | short l_whence; |
diff --git a/include/asm-ia64/fcntl.h b/include/asm-ia64/fcntl.h index b95513370808..a9d04aca7903 100644 --- a/include/asm-ia64/fcntl.h +++ b/include/asm-ia64/fcntl.h | |||
@@ -5,27 +5,6 @@ | |||
5 | * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co. | 5 | * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #define F_GETLK 5 | ||
9 | #define F_SETLK 6 | ||
10 | #define F_SETLKW 7 | ||
11 | |||
12 | #define F_SETOWN 8 /* for sockets. */ | ||
13 | #define F_GETOWN 9 /* for sockets. */ | ||
14 | #define F_SETSIG 10 /* for sockets. */ | ||
15 | #define F_GETSIG 11 /* for sockets. */ | ||
16 | |||
17 | /* for posix fcntl() and lockf() */ | ||
18 | #define F_RDLCK 0 | ||
19 | #define F_WRLCK 1 | ||
20 | #define F_UNLCK 2 | ||
21 | |||
22 | /* for old implementation of bsd flock () */ | ||
23 | #define F_EXLCK 4 /* or 3 */ | ||
24 | #define F_SHLCK 8 /* or 4 */ | ||
25 | |||
26 | /* for leases */ | ||
27 | #define F_INPROGRESS 16 | ||
28 | |||
29 | struct flock { | 8 | struct flock { |
30 | short l_type; | 9 | short l_type; |
31 | short l_whence; | 10 | short l_whence; |
diff --git a/include/asm-m32r/fcntl.h b/include/asm-m32r/fcntl.h index 9e0191c31e3b..ff3a0849bb85 100644 --- a/include/asm-m32r/fcntl.h +++ b/include/asm-m32r/fcntl.h | |||
@@ -5,31 +5,10 @@ | |||
5 | 5 | ||
6 | /* orig : i386 2.4.18 */ | 6 | /* orig : i386 2.4.18 */ |
7 | 7 | ||
8 | #define F_GETLK 5 | ||
9 | #define F_SETLK 6 | ||
10 | #define F_SETLKW 7 | ||
11 | |||
12 | #define F_SETOWN 8 /* for sockets. */ | ||
13 | #define F_GETOWN 9 /* for sockets. */ | ||
14 | #define F_SETSIG 10 /* for sockets. */ | ||
15 | #define F_GETSIG 11 /* for sockets. */ | ||
16 | |||
17 | #define F_GETLK64 12 /* using 'struct flock64' */ | 8 | #define F_GETLK64 12 /* using 'struct flock64' */ |
18 | #define F_SETLK64 13 | 9 | #define F_SETLK64 13 |
19 | #define F_SETLKW64 14 | 10 | #define F_SETLKW64 14 |
20 | 11 | ||
21 | /* for posix fcntl() and lockf() */ | ||
22 | #define F_RDLCK 0 | ||
23 | #define F_WRLCK 1 | ||
24 | #define F_UNLCK 2 | ||
25 | |||
26 | /* for old implementation of bsd flock () */ | ||
27 | #define F_EXLCK 4 /* or 3 */ | ||
28 | #define F_SHLCK 8 /* or 4 */ | ||
29 | |||
30 | /* for leases */ | ||
31 | #define F_INPROGRESS 16 | ||
32 | |||
33 | struct flock { | 12 | struct flock { |
34 | short l_type; | 13 | short l_type; |
35 | short l_whence; | 14 | short l_whence; |
diff --git a/include/asm-m68k/fcntl.h b/include/asm-m68k/fcntl.h index 60a88ce4ba02..7dd8062c8ce6 100644 --- a/include/asm-m68k/fcntl.h +++ b/include/asm-m68k/fcntl.h | |||
@@ -6,31 +6,10 @@ | |||
6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ | 6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ |
7 | #define O_LARGEFILE 0400000 | 7 | #define O_LARGEFILE 0400000 |
8 | 8 | ||
9 | #define F_GETLK 5 | ||
10 | #define F_SETLK 6 | ||
11 | #define F_SETLKW 7 | ||
12 | |||
13 | #define F_SETOWN 8 /* for sockets. */ | ||
14 | #define F_GETOWN 9 /* for sockets. */ | ||
15 | #define F_SETSIG 10 /* for sockets. */ | ||
16 | #define F_GETSIG 11 /* for sockets. */ | ||
17 | |||
18 | #define F_GETLK64 12 /* using 'struct flock64' */ | 9 | #define F_GETLK64 12 /* using 'struct flock64' */ |
19 | #define F_SETLK64 13 | 10 | #define F_SETLK64 13 |
20 | #define F_SETLKW64 14 | 11 | #define F_SETLKW64 14 |
21 | 12 | ||
22 | /* for posix fcntl() and lockf() */ | ||
23 | #define F_RDLCK 0 | ||
24 | #define F_WRLCK 1 | ||
25 | #define F_UNLCK 2 | ||
26 | |||
27 | /* for old implementation of bsd flock () */ | ||
28 | #define F_EXLCK 4 /* or 3 */ | ||
29 | #define F_SHLCK 8 /* or 4 */ | ||
30 | |||
31 | /* for leases */ | ||
32 | #define F_INPROGRESS 16 | ||
33 | |||
34 | struct flock { | 13 | struct flock { |
35 | short l_type; | 14 | short l_type; |
36 | short l_whence; | 15 | short l_whence; |
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h index 67b309d34c09..be971d6ac9b5 100644 --- a/include/asm-mips/fcntl.h +++ b/include/asm-mips/fcntl.h | |||
@@ -33,18 +33,6 @@ | |||
33 | #define F_SETLKW64 35 | 33 | #define F_SETLKW64 35 |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | /* for posix fcntl() and lockf() */ | ||
37 | #define F_RDLCK 0 | ||
38 | #define F_WRLCK 1 | ||
39 | #define F_UNLCK 2 | ||
40 | |||
41 | /* for old implementation of bsd flock () */ | ||
42 | #define F_EXLCK 4 /* or 3 */ | ||
43 | #define F_SHLCK 8 /* or 4 */ | ||
44 | |||
45 | /* for leases */ | ||
46 | #define F_INPROGRESS 16 | ||
47 | |||
48 | /* | 36 | /* |
49 | * The flavours of struct flock. "struct flock" is the ABI compliant | 37 | * The flavours of struct flock. "struct flock" is the ABI compliant |
50 | * variant. Finally struct flock64 is the LFS variant of struct flock. As | 38 | * variant. Finally struct flock64 is the LFS variant of struct flock. As |
diff --git a/include/asm-parisc/fcntl.h b/include/asm-parisc/fcntl.h index 64664ba33440..59a54fff7c63 100644 --- a/include/asm-parisc/fcntl.h +++ b/include/asm-parisc/fcntl.h | |||
@@ -19,9 +19,6 @@ | |||
19 | #define O_NOFOLLOW 00000200 /* don't follow links */ | 19 | #define O_NOFOLLOW 00000200 /* don't follow links */ |
20 | #define O_INVISIBLE 04000000 /* invisible I/O, for DMAPI/XDSM */ | 20 | #define O_INVISIBLE 04000000 /* invisible I/O, for DMAPI/XDSM */ |
21 | 21 | ||
22 | #define F_GETLK 5 | ||
23 | #define F_SETLK 6 | ||
24 | #define F_SETLKW 7 | ||
25 | #define F_GETLK64 8 | 22 | #define F_GETLK64 8 |
26 | #define F_SETLK64 9 | 23 | #define F_SETLK64 9 |
27 | #define F_SETLKW64 10 | 24 | #define F_SETLKW64 10 |
@@ -36,13 +33,6 @@ | |||
36 | #define F_WRLCK 02 | 33 | #define F_WRLCK 02 |
37 | #define F_UNLCK 03 | 34 | #define F_UNLCK 03 |
38 | 35 | ||
39 | /* for old implementation of bsd flock () */ | ||
40 | #define F_EXLCK 4 /* or 3 */ | ||
41 | #define F_SHLCK 8 /* or 4 */ | ||
42 | |||
43 | /* for leases */ | ||
44 | #define F_INPROGRESS 16 | ||
45 | |||
46 | struct flock { | 36 | struct flock { |
47 | short l_type; | 37 | short l_type; |
48 | short l_whence; | 38 | short l_whence; |
diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h index 4e0cfdb2001a..8549c0332c98 100644 --- a/include/asm-ppc/fcntl.h +++ b/include/asm-ppc/fcntl.h | |||
@@ -6,33 +6,12 @@ | |||
6 | #define O_LARGEFILE 0200000 | 6 | #define O_LARGEFILE 0200000 |
7 | #define O_DIRECT 0400000 /* direct disk access hint */ | 7 | #define O_DIRECT 0400000 /* direct disk access hint */ |
8 | 8 | ||
9 | #define F_GETLK 5 | ||
10 | #define F_SETLK 6 | ||
11 | #define F_SETLKW 7 | ||
12 | |||
13 | #define F_SETOWN 8 /* for sockets. */ | ||
14 | #define F_GETOWN 9 /* for sockets. */ | ||
15 | #define F_SETSIG 10 /* for sockets. */ | ||
16 | #define F_GETSIG 11 /* for sockets. */ | ||
17 | |||
18 | #ifndef __powerpc64__ | 9 | #ifndef __powerpc64__ |
19 | #define F_GETLK64 12 /* using 'struct flock64' */ | 10 | #define F_GETLK64 12 /* using 'struct flock64' */ |
20 | #define F_SETLK64 13 | 11 | #define F_SETLK64 13 |
21 | #define F_SETLKW64 14 | 12 | #define F_SETLKW64 14 |
22 | #endif | 13 | #endif |
23 | 14 | ||
24 | /* for posix fcntl() and lockf() */ | ||
25 | #define F_RDLCK 0 | ||
26 | #define F_WRLCK 1 | ||
27 | #define F_UNLCK 2 | ||
28 | |||
29 | /* for old implementation of bsd flock () */ | ||
30 | #define F_EXLCK 4 /* or 3 */ | ||
31 | #define F_SHLCK 8 /* or 4 */ | ||
32 | |||
33 | /* for leases */ | ||
34 | #define F_INPROGRESS 16 | ||
35 | |||
36 | struct flock { | 15 | struct flock { |
37 | short l_type; | 16 | short l_type; |
38 | short l_whence; | 17 | short l_whence; |
diff --git a/include/asm-s390/fcntl.h b/include/asm-s390/fcntl.h index ea9a75bd6c96..2974433e8ea4 100644 --- a/include/asm-s390/fcntl.h +++ b/include/asm-s390/fcntl.h | |||
@@ -8,33 +8,12 @@ | |||
8 | #ifndef _S390_FCNTL_H | 8 | #ifndef _S390_FCNTL_H |
9 | #define _S390_FCNTL_H | 9 | #define _S390_FCNTL_H |
10 | 10 | ||
11 | #define F_GETLK 5 | ||
12 | #define F_SETLK 6 | ||
13 | #define F_SETLKW 7 | ||
14 | |||
15 | #define F_SETOWN 8 /* for sockets. */ | ||
16 | #define F_GETOWN 9 /* for sockets. */ | ||
17 | #define F_SETSIG 10 /* for sockets. */ | ||
18 | #define F_GETSIG 11 /* for sockets. */ | ||
19 | |||
20 | #ifndef __s390x__ | 11 | #ifndef __s390x__ |
21 | #define F_GETLK64 12 /* using 'struct flock64' */ | 12 | #define F_GETLK64 12 /* using 'struct flock64' */ |
22 | #define F_SETLK64 13 | 13 | #define F_SETLK64 13 |
23 | #define F_SETLKW64 14 | 14 | #define F_SETLKW64 14 |
24 | #endif /* ! __s390x__ */ | 15 | #endif /* ! __s390x__ */ |
25 | 16 | ||
26 | /* for posix fcntl() and lockf() */ | ||
27 | #define F_RDLCK 0 | ||
28 | #define F_WRLCK 1 | ||
29 | #define F_UNLCK 2 | ||
30 | |||
31 | /* for old implementation of bsd flock () */ | ||
32 | #define F_EXLCK 4 /* or 3 */ | ||
33 | #define F_SHLCK 8 /* or 4 */ | ||
34 | |||
35 | /* for leases */ | ||
36 | #define F_INPROGRESS 16 | ||
37 | |||
38 | struct flock { | 17 | struct flock { |
39 | short l_type; | 18 | short l_type; |
40 | short l_whence; | 19 | short l_whence; |
diff --git a/include/asm-sh/fcntl.h b/include/asm-sh/fcntl.h index 0441ad64f7cb..1db7b74450b5 100644 --- a/include/asm-sh/fcntl.h +++ b/include/asm-sh/fcntl.h | |||
@@ -1,31 +1,10 @@ | |||
1 | #ifndef __ASM_SH_FCNTL_H | 1 | #ifndef __ASM_SH_FCNTL_H |
2 | #define __ASM_SH_FCNTL_H | 2 | #define __ASM_SH_FCNTL_H |
3 | 3 | ||
4 | #define F_GETLK 5 | ||
5 | #define F_SETLK 6 | ||
6 | #define F_SETLKW 7 | ||
7 | |||
8 | #define F_SETOWN 8 /* for sockets. */ | ||
9 | #define F_GETOWN 9 /* for sockets. */ | ||
10 | #define F_SETSIG 10 /* for sockets. */ | ||
11 | #define F_GETSIG 11 /* for sockets. */ | ||
12 | |||
13 | #define F_GETLK64 12 /* using 'struct flock64' */ | 4 | #define F_GETLK64 12 /* using 'struct flock64' */ |
14 | #define F_SETLK64 13 | 5 | #define F_SETLK64 13 |
15 | #define F_SETLKW64 14 | 6 | #define F_SETLKW64 14 |
16 | 7 | ||
17 | /* for posix fcntl() and lockf() */ | ||
18 | #define F_RDLCK 0 | ||
19 | #define F_WRLCK 1 | ||
20 | #define F_UNLCK 2 | ||
21 | |||
22 | /* for old implementation of bsd flock () */ | ||
23 | #define F_EXLCK 4 /* or 3 */ | ||
24 | #define F_SHLCK 8 /* or 4 */ | ||
25 | |||
26 | /* for leases */ | ||
27 | #define F_INPROGRESS 16 | ||
28 | |||
29 | struct flock { | 8 | struct flock { |
30 | short l_type; | 9 | short l_type; |
31 | short l_whence; | 10 | short l_whence; |
diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h index 1d35c90daec7..61334bff18c4 100644 --- a/include/asm-sparc/fcntl.h +++ b/include/asm-sparc/fcntl.h | |||
@@ -22,8 +22,6 @@ | |||
22 | #define F_GETLK 7 | 22 | #define F_GETLK 7 |
23 | #define F_SETLK 8 | 23 | #define F_SETLK 8 |
24 | #define F_SETLKW 9 | 24 | #define F_SETLKW 9 |
25 | #define F_SETSIG 10 /* for sockets. */ | ||
26 | #define F_GETSIG 11 /* for sockets. */ | ||
27 | 25 | ||
28 | #define F_GETLK64 12 /* using 'struct flock64' */ | 26 | #define F_GETLK64 12 /* using 'struct flock64' */ |
29 | #define F_SETLK64 13 | 27 | #define F_SETLK64 13 |
@@ -34,13 +32,6 @@ | |||
34 | #define F_WRLCK 2 | 32 | #define F_WRLCK 2 |
35 | #define F_UNLCK 3 | 33 | #define F_UNLCK 3 |
36 | 34 | ||
37 | /* for old implementation of bsd flock () */ | ||
38 | #define F_EXLCK 4 /* or 3 */ | ||
39 | #define F_SHLCK 8 /* or 4 */ | ||
40 | |||
41 | /* for leases */ | ||
42 | #define F_INPROGRESS 16 | ||
43 | |||
44 | struct flock { | 35 | struct flock { |
45 | short l_type; | 36 | short l_type; |
46 | short l_whence; | 37 | short l_whence; |
diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h index 3e82239a7715..3db10e076eec 100644 --- a/include/asm-sparc64/fcntl.h +++ b/include/asm-sparc64/fcntl.h | |||
@@ -23,21 +23,12 @@ | |||
23 | #define F_GETLK 7 | 23 | #define F_GETLK 7 |
24 | #define F_SETLK 8 | 24 | #define F_SETLK 8 |
25 | #define F_SETLKW 9 | 25 | #define F_SETLKW 9 |
26 | #define F_SETSIG 10 /* for sockets. */ | ||
27 | #define F_GETSIG 11 /* for sockets. */ | ||
28 | 26 | ||
29 | /* for posix fcntl() and lockf() */ | 27 | /* for posix fcntl() and lockf() */ |
30 | #define F_RDLCK 1 | 28 | #define F_RDLCK 1 |
31 | #define F_WRLCK 2 | 29 | #define F_WRLCK 2 |
32 | #define F_UNLCK 3 | 30 | #define F_UNLCK 3 |
33 | 31 | ||
34 | /* for old implementation of bsd flock () */ | ||
35 | #define F_EXLCK 4 /* or 3 */ | ||
36 | #define F_SHLCK 8 /* or 4 */ | ||
37 | |||
38 | /* for leases */ | ||
39 | #define F_INPROGRESS 16 | ||
40 | |||
41 | struct flock { | 32 | struct flock { |
42 | short l_type; | 33 | short l_type; |
43 | short l_whence; | 34 | short l_whence; |
diff --git a/include/asm-v850/fcntl.h b/include/asm-v850/fcntl.h index fff7d57f1757..70015131e4b2 100644 --- a/include/asm-v850/fcntl.h +++ b/include/asm-v850/fcntl.h | |||
@@ -6,31 +6,10 @@ | |||
6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ | 6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ |
7 | #define O_LARGEFILE 0400000 | 7 | #define O_LARGEFILE 0400000 |
8 | 8 | ||
9 | #define F_GETLK 5 | ||
10 | #define F_SETLK 6 | ||
11 | #define F_SETLKW 7 | ||
12 | |||
13 | #define F_SETOWN 8 /* for sockets. */ | ||
14 | #define F_GETOWN 9 /* for sockets. */ | ||
15 | #define F_SETSIG 10 /* for sockets. */ | ||
16 | #define F_GETSIG 11 /* for sockets. */ | ||
17 | |||
18 | #define F_GETLK64 12 /* using 'struct flock64' */ | 9 | #define F_GETLK64 12 /* using 'struct flock64' */ |
19 | #define F_SETLK64 13 | 10 | #define F_SETLK64 13 |
20 | #define F_SETLKW64 14 | 11 | #define F_SETLKW64 14 |
21 | 12 | ||
22 | /* for posix fcntl() and lockf() */ | ||
23 | #define F_RDLCK 0 | ||
24 | #define F_WRLCK 1 | ||
25 | #define F_UNLCK 2 | ||
26 | |||
27 | /* for old implementation of bsd flock () */ | ||
28 | #define F_EXLCK 4 /* or 3 */ | ||
29 | #define F_SHLCK 8 /* or 4 */ | ||
30 | |||
31 | /* for leases */ | ||
32 | #define F_INPROGRESS 16 | ||
33 | |||
34 | struct flock { | 13 | struct flock { |
35 | short l_type; | 14 | short l_type; |
36 | short l_whence; | 15 | short l_whence; |
diff --git a/include/asm-x86_64/fcntl.h b/include/asm-x86_64/fcntl.h index 4e800feddcfa..c7b09ea97d36 100644 --- a/include/asm-x86_64/fcntl.h +++ b/include/asm-x86_64/fcntl.h | |||
@@ -1,27 +1,6 @@ | |||
1 | #ifndef _X86_64_FCNTL_H | 1 | #ifndef _X86_64_FCNTL_H |
2 | #define _X86_64_FCNTL_H | 2 | #define _X86_64_FCNTL_H |
3 | 3 | ||
4 | #define F_GETLK 5 | ||
5 | #define F_SETLK 6 | ||
6 | #define F_SETLKW 7 | ||
7 | |||
8 | #define F_SETOWN 8 /* for sockets. */ | ||
9 | #define F_GETOWN 9 /* for sockets. */ | ||
10 | #define F_SETSIG 10 /* for sockets. */ | ||
11 | #define F_GETSIG 11 /* for sockets. */ | ||
12 | |||
13 | /* for posix fcntl() and lockf() */ | ||
14 | #define F_RDLCK 0 | ||
15 | #define F_WRLCK 1 | ||
16 | #define F_UNLCK 2 | ||
17 | |||
18 | /* for old implementation of bsd flock () */ | ||
19 | #define F_EXLCK 4 /* or 3 */ | ||
20 | #define F_SHLCK 8 /* or 4 */ | ||
21 | |||
22 | /* for leases */ | ||
23 | #define F_INPROGRESS 16 | ||
24 | |||
25 | struct flock { | 4 | struct flock { |
26 | short l_type; | 5 | short l_type; |
27 | short l_whence; | 6 | short l_whence; |
diff --git a/include/asm-xtensa/fcntl.h b/include/asm-xtensa/fcntl.h index 7724345ee077..06f0dc9cc525 100644 --- a/include/asm-xtensa/fcntl.h +++ b/include/asm-xtensa/fcntl.h | |||
@@ -34,20 +34,6 @@ | |||
34 | 34 | ||
35 | #define F_SETOWN 24 /* for sockets. */ | 35 | #define F_SETOWN 24 /* for sockets. */ |
36 | #define F_GETOWN 23 /* for sockets. */ | 36 | #define F_GETOWN 23 /* for sockets. */ |
37 | #define F_SETSIG 10 /* for sockets. */ | ||
38 | #define F_GETSIG 11 /* for sockets. */ | ||
39 | |||
40 | /* for posix fcntl() and lockf() */ | ||
41 | #define F_RDLCK 0 | ||
42 | #define F_WRLCK 1 | ||
43 | #define F_UNLCK 2 | ||
44 | |||
45 | /* for old implementation of bsd flock () */ | ||
46 | #define F_EXLCK 4 /* or 3 */ | ||
47 | #define F_SHLCK 8 /* or 4 */ | ||
48 | |||
49 | /* for leases */ | ||
50 | #define F_INPROGRESS 16 | ||
51 | 37 | ||
52 | typedef struct flock { | 38 | typedef struct flock { |
53 | short l_type; | 39 | short l_type; |