aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/asm-alpha/fcntl.h8
-rw-r--r--include/asm-arm/fcntl.h8
-rw-r--r--include/asm-arm26/fcntl.h8
-rw-r--r--include/asm-cris/fcntl.h8
-rw-r--r--include/asm-frv/fcntl.h8
-rw-r--r--include/asm-generic/fcntl.h17
-rw-r--r--include/asm-h8300/fcntl.h8
-rw-r--r--include/asm-i386/fcntl.h8
-rw-r--r--include/asm-ia64/fcntl.h8
-rw-r--r--include/asm-m32r/fcntl.h12
-rw-r--r--include/asm-m68k/fcntl.h8
-rw-r--r--include/asm-mips/fcntl.h17
-rw-r--r--include/asm-parisc/fcntl.h8
-rw-r--r--include/asm-ppc/fcntl.h10
-rw-r--r--include/asm-s390/fcntl.h10
-rw-r--r--include/asm-sh/fcntl.h8
-rw-r--r--include/asm-sparc/fcntl.h11
-rw-r--r--include/asm-sparc64/fcntl.h9
-rw-r--r--include/asm-v850/fcntl.h8
-rw-r--r--include/asm-x86_64/fcntl.h13
-rw-r--r--include/asm-xtensa/fcntl.h2
21 files changed, 26 insertions, 171 deletions
diff --git a/include/asm-alpha/fcntl.h b/include/asm-alpha/fcntl.h
index e2aacbbe38bc..87f2cf459e26 100644
--- a/include/asm-alpha/fcntl.h
+++ b/include/asm-alpha/fcntl.h
@@ -37,14 +37,6 @@
37 37
38#define F_INPROGRESS 64 38#define F_INPROGRESS 64
39 39
40struct flock {
41 short l_type;
42 short l_whence;
43 __kernel_off_t l_start;
44 __kernel_off_t l_len;
45 __kernel_pid_t l_pid;
46};
47
48#include <asm-generic/fcntl.h> 40#include <asm-generic/fcntl.h>
49 41
50#endif 42#endif
diff --git a/include/asm-arm/fcntl.h b/include/asm-arm/fcntl.h
index 6337df23831f..1816a6ac6f10 100644
--- a/include/asm-arm/fcntl.h
+++ b/include/asm-arm/fcntl.h
@@ -10,14 +10,6 @@
10#define F_SETLK64 13 10#define F_SETLK64 13
11#define F_SETLKW64 14 11#define F_SETLKW64 14
12 12
13struct flock {
14 short l_type;
15 short l_whence;
16 off_t l_start;
17 off_t l_len;
18 pid_t l_pid;
19};
20
21struct flock64 { 13struct flock64 {
22 short l_type; 14 short l_type;
23 short l_whence; 15 short l_whence;
diff --git a/include/asm-arm26/fcntl.h b/include/asm-arm26/fcntl.h
index 2f08302fa8c6..b88f8d08c60c 100644
--- a/include/asm-arm26/fcntl.h
+++ b/include/asm-arm26/fcntl.h
@@ -12,14 +12,6 @@
12#define F_SETLK64 13 12#define F_SETLK64 13
13#define F_SETLKW64 14 13#define F_SETLKW64 14
14 14
15struct flock {
16 short l_type;
17 short l_whence;
18 off_t l_start;
19 off_t l_len;
20 pid_t l_pid;
21};
22
23struct flock64 { 15struct flock64 {
24 short l_type; 16 short l_type;
25 short l_whence; 17 short l_whence;
diff --git a/include/asm-cris/fcntl.h b/include/asm-cris/fcntl.h
index e91b576985d2..f8e7d1307ebc 100644
--- a/include/asm-cris/fcntl.h
+++ b/include/asm-cris/fcntl.h
@@ -5,14 +5,6 @@
5#define F_SETLK64 13 5#define F_SETLK64 13
6#define F_SETLKW64 14 6#define F_SETLKW64 14
7 7
8struct flock {
9 short l_type;
10 short l_whence;
11 off_t l_start;
12 off_t l_len;
13 pid_t l_pid;
14};
15
16struct flock64 { 8struct flock64 {
17 short l_type; 9 short l_type;
18 short l_whence; 10 short l_whence;
diff --git a/include/asm-frv/fcntl.h b/include/asm-frv/fcntl.h
index e5523669b62e..0b212d945adb 100644
--- a/include/asm-frv/fcntl.h
+++ b/include/asm-frv/fcntl.h
@@ -5,14 +5,6 @@
5#define F_SETLK64 13 5#define F_SETLK64 13
6#define F_SETLKW64 14 6#define F_SETLKW64 14
7 7
8struct flock {
9 short l_type;
10 short l_whence;
11 off_t l_start;
12 off_t l_len;
13 pid_t l_pid;
14};
15
16struct flock64 { 8struct flock64 {
17 short l_type; 9 short l_type;
18 short l_whence; 10 short l_whence;
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 */
diff --git a/include/asm-h8300/fcntl.h b/include/asm-h8300/fcntl.h
index 805aaa09c717..8caeb05e84df 100644
--- a/include/asm-h8300/fcntl.h
+++ b/include/asm-h8300/fcntl.h
@@ -10,14 +10,6 @@
10#define F_SETLK64 13 10#define F_SETLK64 13
11#define F_SETLKW64 14 11#define F_SETLKW64 14
12 12
13struct flock {
14 short l_type;
15 short l_whence;
16 off_t l_start;
17 off_t l_len;
18 pid_t l_pid;
19};
20
21struct flock64 { 13struct flock64 {
22 short l_type; 14 short l_type;
23 short l_whence; 15 short l_whence;
diff --git a/include/asm-i386/fcntl.h b/include/asm-i386/fcntl.h
index 1d06913c3bfd..01f17d29d288 100644
--- a/include/asm-i386/fcntl.h
+++ b/include/asm-i386/fcntl.h
@@ -5,14 +5,6 @@
5#define F_SETLK64 13 5#define F_SETLK64 13
6#define F_SETLKW64 14 6#define F_SETLKW64 14
7 7
8struct flock {
9 short l_type;
10 short l_whence;
11 off_t l_start;
12 off_t l_len;
13 pid_t l_pid;
14};
15
16struct flock64 { 8struct flock64 {
17 short l_type; 9 short l_type;
18 short l_whence; 10 short l_whence;
diff --git a/include/asm-ia64/fcntl.h b/include/asm-ia64/fcntl.h
index a9d04aca7903..1dd275dc8f65 100644
--- a/include/asm-ia64/fcntl.h
+++ b/include/asm-ia64/fcntl.h
@@ -5,14 +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
8struct flock {
9 short l_type;
10 short l_whence;
11 off_t l_start;
12 off_t l_len;
13 pid_t l_pid;
14};
15
16#define force_o_largefile() \ 8#define force_o_largefile() \
17 (personality(current->personality) != PER_LINUX32) 9 (personality(current->personality) != PER_LINUX32)
18 10
diff --git a/include/asm-m32r/fcntl.h b/include/asm-m32r/fcntl.h
index ff3a0849bb85..90f71735fa9a 100644
--- a/include/asm-m32r/fcntl.h
+++ b/include/asm-m32r/fcntl.h
@@ -1,22 +1,10 @@
1#ifndef _ASM_M32R_FCNTL_H 1#ifndef _ASM_M32R_FCNTL_H
2#define _ASM_M32R_FCNTL_H 2#define _ASM_M32R_FCNTL_H
3 3
4/* $Id$ */
5
6/* orig : i386 2.4.18 */
7
8#define F_GETLK64 12 /* using 'struct flock64' */ 4#define F_GETLK64 12 /* using 'struct flock64' */
9#define F_SETLK64 13 5#define F_SETLK64 13
10#define F_SETLKW64 14 6#define F_SETLKW64 14
11 7
12struct flock {
13 short l_type;
14 short l_whence;
15 off_t l_start;
16 off_t l_len;
17 pid_t l_pid;
18};
19
20struct flock64 { 8struct flock64 {
21 short l_type; 9 short l_type;
22 short l_whence; 10 short l_whence;
diff --git a/include/asm-m68k/fcntl.h b/include/asm-m68k/fcntl.h
index 7dd8062c8ce6..d3b24e3fbac0 100644
--- a/include/asm-m68k/fcntl.h
+++ b/include/asm-m68k/fcntl.h
@@ -10,14 +10,6 @@
10#define F_SETLK64 13 10#define F_SETLK64 13
11#define F_SETLKW64 14 11#define F_SETLKW64 14
12 12
13struct flock {
14 short l_type;
15 short l_whence;
16 off_t l_start;
17 off_t l_len;
18 pid_t l_pid;
19};
20
21struct flock64 { 13struct flock64 {
22 short l_type; 14 short l_type;
23 short l_whence; 15 short l_whence;
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h
index be971d6ac9b5..fb824bf09296 100644
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
@@ -50,7 +50,7 @@ struct flock {
50 long l_sysid; 50 long l_sysid;
51 __kernel_pid_t l_pid; 51 __kernel_pid_t l_pid;
52 long pad[4]; 52 long pad[4];
53} flock_t; 53};
54 54
55typedef struct flock64 { 55typedef struct flock64 {
56 short l_type; 56 short l_type;
@@ -60,22 +60,13 @@ typedef struct flock64 {
60 pid_t l_pid; 60 pid_t l_pid;
61} flock64_t; 61} flock64_t;
62 62
63#else /* 64-bit definitions */
64 63
65typedef struct flock { 64#define HAVE_ARCH_STRUCT_FLOCK
66 short l_type;
67 short l_whence;
68 __kernel_off_t l_start;
69 __kernel_off_t l_len;
70 __kernel_pid_t l_pid;
71} flock_t;
72
73#ifdef __KERNEL__
74#define flock64 flock
75#endif
76 65
77#endif 66#endif
78 67
79#include <asm-generic/fcntl.h> 68#include <asm-generic/fcntl.h>
80 69
70typedef struct flock flock_t;
71
81#endif /* _ASM_FCNTL_H */ 72#endif /* _ASM_FCNTL_H */
diff --git a/include/asm-parisc/fcntl.h b/include/asm-parisc/fcntl.h
index 59a54fff7c63..eadda003c201 100644
--- a/include/asm-parisc/fcntl.h
+++ b/include/asm-parisc/fcntl.h
@@ -33,14 +33,6 @@
33#define F_WRLCK 02 33#define F_WRLCK 02
34#define F_UNLCK 03 34#define F_UNLCK 03
35 35
36struct flock {
37 short l_type;
38 short l_whence;
39 off_t l_start;
40 off_t l_len;
41 pid_t l_pid;
42};
43
44struct flock64 { 36struct flock64 {
45 short l_type; 37 short l_type;
46 short l_whence; 38 short l_whence;
diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h
index 8549c0332c98..4480f21bfdea 100644
--- a/include/asm-ppc/fcntl.h
+++ b/include/asm-ppc/fcntl.h
@@ -10,17 +10,7 @@
10#define F_GETLK64 12 /* using 'struct flock64' */ 10#define F_GETLK64 12 /* using 'struct flock64' */
11#define F_SETLK64 13 11#define F_SETLK64 13
12#define F_SETLKW64 14 12#define F_SETLKW64 14
13#endif
14
15struct flock {
16 short l_type;
17 short l_whence;
18 off_t l_start;
19 off_t l_len;
20 pid_t l_pid;
21};
22 13
23#ifndef __powerpc64__
24struct flock64 { 14struct flock64 {
25 short l_type; 15 short l_type;
26 short l_whence; 16 short l_whence;
diff --git a/include/asm-s390/fcntl.h b/include/asm-s390/fcntl.h
index 2974433e8ea4..3a66fba09ee9 100644
--- a/include/asm-s390/fcntl.h
+++ b/include/asm-s390/fcntl.h
@@ -12,17 +12,7 @@
12#define F_GETLK64 12 /* using 'struct flock64' */ 12#define F_GETLK64 12 /* using 'struct flock64' */
13#define F_SETLK64 13 13#define F_SETLK64 13
14#define F_SETLKW64 14 14#define F_SETLKW64 14
15#endif /* ! __s390x__ */
16 15
17struct flock {
18 short l_type;
19 short l_whence;
20 off_t l_start;
21 off_t l_len;
22 pid_t l_pid;
23};
24
25#ifndef __s390x__
26struct flock64 { 16struct flock64 {
27 short l_type; 17 short l_type;
28 short l_whence; 18 short l_whence;
diff --git a/include/asm-sh/fcntl.h b/include/asm-sh/fcntl.h
index 1db7b74450b5..c481bab8ba17 100644
--- a/include/asm-sh/fcntl.h
+++ b/include/asm-sh/fcntl.h
@@ -5,14 +5,6 @@
5#define F_SETLK64 13 5#define F_SETLK64 13
6#define F_SETLKW64 14 6#define F_SETLKW64 14
7 7
8struct flock {
9 short l_type;
10 short l_whence;
11 off_t l_start;
12 off_t l_len;
13 pid_t l_pid;
14};
15
16struct flock64 { 8struct flock64 {
17 short l_type; 9 short l_type;
18 short l_whence; 10 short l_whence;
diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index 61334bff18c4..634557374e95 100644
--- a/include/asm-sparc/fcntl.h
+++ b/include/asm-sparc/fcntl.h
@@ -32,15 +32,6 @@
32#define F_WRLCK 2 32#define F_WRLCK 2
33#define F_UNLCK 3 33#define F_UNLCK 3
34 34
35struct flock {
36 short l_type;
37 short l_whence;
38 off_t l_start;
39 off_t l_len;
40 pid_t l_pid;
41 short __unused;
42};
43
44struct flock64 { 35struct flock64 {
45 short l_type; 36 short l_type;
46 short l_whence; 37 short l_whence;
@@ -50,6 +41,8 @@ struct flock64 {
50 short __unused; 41 short __unused;
51}; 42};
52 43
44#define __ARCH_FLOCK_PAD short __unused;
45
53#include <asm-generic/fcntl.h> 46#include <asm-generic/fcntl.h>
54 47
55#endif 48#endif
diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h
index 3db10e076eec..b2aecf0054bd 100644
--- a/include/asm-sparc64/fcntl.h
+++ b/include/asm-sparc64/fcntl.h
@@ -29,14 +29,7 @@
29#define F_WRLCK 2 29#define F_WRLCK 2
30#define F_UNLCK 3 30#define F_UNLCK 3
31 31
32struct flock { 32#define __ARCH_FLOCK_PAD short __unused;
33 short l_type;
34 short l_whence;
35 off_t l_start;
36 off_t l_len;
37 pid_t l_pid;
38 short __unused;
39};
40 33
41#include <asm-generic/fcntl.h> 34#include <asm-generic/fcntl.h>
42 35
diff --git a/include/asm-v850/fcntl.h b/include/asm-v850/fcntl.h
index 70015131e4b2..0fd47f0c6a8a 100644
--- a/include/asm-v850/fcntl.h
+++ b/include/asm-v850/fcntl.h
@@ -10,14 +10,6 @@
10#define F_SETLK64 13 10#define F_SETLK64 13
11#define F_SETLKW64 14 11#define F_SETLKW64 14
12 12
13struct flock {
14 short l_type;
15 short l_whence;
16 off_t l_start;
17 off_t l_len;
18 pid_t l_pid;
19};
20
21struct flock64 { 13struct flock64 {
22 short l_type; 14 short l_type;
23 short l_whence; 15 short l_whence;
diff --git a/include/asm-x86_64/fcntl.h b/include/asm-x86_64/fcntl.h
index c7b09ea97d36..46ab12db5739 100644
--- a/include/asm-x86_64/fcntl.h
+++ b/include/asm-x86_64/fcntl.h
@@ -1,14 +1 @@
1#ifndef _X86_64_FCNTL_H
2#define _X86_64_FCNTL_H
3
4struct flock {
5 short l_type;
6 short l_whence;
7 off_t l_start;
8 off_t l_len;
9 pid_t l_pid;
10};
11
12#include <asm-generic/fcntl.h> #include <asm-generic/fcntl.h>
13
14#endif /* !_X86_64_FCNTL_H */
diff --git a/include/asm-xtensa/fcntl.h b/include/asm-xtensa/fcntl.h
index 06f0dc9cc525..fdae0e170585 100644
--- a/include/asm-xtensa/fcntl.h
+++ b/include/asm-xtensa/fcntl.h
@@ -53,6 +53,8 @@ struct flock64 {
53 pid_t l_pid; 53 pid_t l_pid;
54}; 54};
55 55
56#define HAVE_ARCH_STRUCT_FLOCK
57
56#include <asm-generic/fcntl.h> 58#include <asm-generic/fcntl.h>
57 59
58#endif /* _XTENSA_FCNTL_H */ 60#endif /* _XTENSA_FCNTL_H */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-27 09:34:23 -0500