aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--include/asm-arm/fcntl.h12
-rw-r--r--include/asm-arm26/fcntl.h12
-rw-r--r--include/asm-cris/fcntl.h17
-rw-r--r--include/asm-frv/fcntl.h18
-rw-r--r--include/asm-generic/fcntl.h25
-rw-r--r--include/asm-h8300/fcntl.h12
-rw-r--r--include/asm-i386/fcntl.h17
-rw-r--r--include/asm-m32r/fcntl.h17
-rw-r--r--include/asm-m68k/fcntl.h12
-rw-r--r--include/asm-mips/fcntl.h12
-rw-r--r--include/asm-parisc/fcntl.h8
-rw-r--r--include/asm-ppc/fcntl.h14
-rw-r--r--include/asm-s390/fcntl.h26
-rw-r--r--include/asm-sh/fcntl.h18
-rw-r--r--include/asm-sh64/fcntl.h6
-rw-r--r--include/asm-sparc/fcntl.h14
-rw-r--r--include/asm-v850/fcntl.h12
-rw-r--r--include/asm-xtensa/fcntl.h1
18 files changed, 30 insertions, 223 deletions
diff --git a/include/asm-arm/fcntl.h b/include/asm-arm/fcntl.h
index 1816a6ac6f10..a80b6607b2ef 100644
--- a/include/asm-arm/fcntl.h
+++ b/include/asm-arm/fcntl.h
@@ -6,18 +6,6 @@
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_GETLK64 12 /* using 'struct flock64' */
10#define F_SETLK64 13
11#define F_SETLKW64 14
12
13struct flock64 {
14 short l_type;
15 short l_whence;
16 loff_t l_start;
17 loff_t l_len;
18 pid_t l_pid;
19};
20
21#include <asm-generic/fcntl.h> 9#include <asm-generic/fcntl.h>
22 10
23#endif 11#endif
diff --git a/include/asm-arm26/fcntl.h b/include/asm-arm26/fcntl.h
index b88f8d08c60c..d85995e7459e 100644
--- a/include/asm-arm26/fcntl.h
+++ b/include/asm-arm26/fcntl.h
@@ -8,18 +8,6 @@
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_GETLK64 12 /* using 'struct flock64' */
12#define F_SETLK64 13
13#define F_SETLKW64 14
14
15struct flock64 {
16 short l_type;
17 short l_whence;
18 loff_t l_start;
19 loff_t l_len;
20 pid_t l_pid;
21};
22
23#include <asm-generic/fcntl.h> 11#include <asm-generic/fcntl.h>
24 12
25#endif 13#endif
diff --git a/include/asm-cris/fcntl.h b/include/asm-cris/fcntl.h
index f8e7d1307ebc..46ab12db5739 100644
--- a/include/asm-cris/fcntl.h
+++ b/include/asm-cris/fcntl.h
@@ -1,18 +1 @@
1#ifndef _CRIS_FCNTL_H
2#define _CRIS_FCNTL_H
3
4#define F_GETLK64 12 /* using 'struct flock64' */
5#define F_SETLK64 13
6#define F_SETLKW64 14
7
8struct flock64 {
9 short l_type;
10 short l_whence;
11 loff_t l_start;
12 loff_t l_len;
13 pid_t l_pid;
14};
15
16#include <asm-generic/fcntl.h> #include <asm-generic/fcntl.h>
17
18#endif
diff --git a/include/asm-frv/fcntl.h b/include/asm-frv/fcntl.h
index 0b212d945adb..46ab12db5739 100644
--- a/include/asm-frv/fcntl.h
+++ b/include/asm-frv/fcntl.h
@@ -1,19 +1 @@
1#ifndef _ASM_FCNTL_H
2#define _ASM_FCNTL_H
3
4#define F_GETLK64 12 /* using 'struct flock64' */
5#define F_SETLK64 13
6#define F_SETLKW64 14
7
8struct flock64 {
9 short l_type;
10 short l_whence;
11 loff_t l_start;
12 loff_t l_len;
13 pid_t l_pid;
14};
15
16#include <asm-generic/fcntl.h> #include <asm-generic/fcntl.h>
17
18#endif /* _ASM_FCNTL_H */
19
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index b001d7fe0384..b663520dcdc4 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -1,6 +1,7 @@
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/config.h>
4#include <linux/types.h> 5#include <linux/types.h>
5 6
6/* open/fcntl - O_SYNC is only implemented on blocks devices and on files 7/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
@@ -121,4 +122,28 @@ struct flock {
121}; 122};
122#endif 123#endif
123 124
125#ifndef CONFIG_64BIT
126
127#ifndef F_GETLK64
128#define F_GETLK64 12 /* using 'struct flock64' */
129#define F_SETLK64 13
130#define F_SETLKW64 14
131#endif
132
133#ifndef HAVE_ARCH_STRUCT_FLOCK64
134#ifndef __ARCH_FLOCK64_PAD
135#define __ARCH_FLOCK64_PAD
136#endif
137
138struct flock64 {
139 short l_type;
140 short l_whence;
141 loff_t l_start;
142 loff_t l_len;
143 pid_t l_pid;
144 __ARCH_FLOCK64_PAD
145};
146#endif
147#endif /* !CONFIG_64BIT */
148
124#endif /* _ASM_GENERIC_FCNTL_H */ 149#endif /* _ASM_GENERIC_FCNTL_H */
diff --git a/include/asm-h8300/fcntl.h b/include/asm-h8300/fcntl.h
index 8caeb05e84df..1952cb2e3b06 100644
--- a/include/asm-h8300/fcntl.h
+++ b/include/asm-h8300/fcntl.h
@@ -6,18 +6,6 @@
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_GETLK64 12 /* using 'struct flock64' */
10#define F_SETLK64 13
11#define F_SETLKW64 14
12
13struct flock64 {
14 short l_type;
15 short l_whence;
16 loff_t l_start;
17 loff_t l_len;
18 pid_t l_pid;
19};
20
21#include <asm-generic/fcntl.h> 9#include <asm-generic/fcntl.h>
22 10
23#endif /* _H8300_FCNTL_H */ 11#endif /* _H8300_FCNTL_H */
diff --git a/include/asm-i386/fcntl.h b/include/asm-i386/fcntl.h
index 01f17d29d288..46ab12db5739 100644
--- a/include/asm-i386/fcntl.h
+++ b/include/asm-i386/fcntl.h
@@ -1,18 +1 @@
1#ifndef _I386_FCNTL_H
2#define _I386_FCNTL_H
3
4#define F_GETLK64 12 /* using 'struct flock64' */
5#define F_SETLK64 13
6#define F_SETLKW64 14
7
8struct flock64 {
9 short l_type;
10 short l_whence;
11 loff_t l_start;
12 loff_t l_len;
13 pid_t l_pid;
14};
15
16#include <asm-generic/fcntl.h> #include <asm-generic/fcntl.h>
17
18#endif
diff --git a/include/asm-m32r/fcntl.h b/include/asm-m32r/fcntl.h
index 90f71735fa9a..46ab12db5739 100644
--- a/include/asm-m32r/fcntl.h
+++ b/include/asm-m32r/fcntl.h
@@ -1,18 +1 @@
1#ifndef _ASM_M32R_FCNTL_H
2#define _ASM_M32R_FCNTL_H
3
4#define F_GETLK64 12 /* using 'struct flock64' */
5#define F_SETLK64 13
6#define F_SETLKW64 14
7
8struct flock64 {
9 short l_type;
10 short l_whence;
11 loff_t l_start;
12 loff_t l_len;
13 pid_t l_pid;
14};
15
16#include <asm-generic/fcntl.h> #include <asm-generic/fcntl.h>
17
18#endif /* _ASM_M32R_FCNTL_H */
diff --git a/include/asm-m68k/fcntl.h b/include/asm-m68k/fcntl.h
index d3b24e3fbac0..1c369b20dc45 100644
--- a/include/asm-m68k/fcntl.h
+++ b/include/asm-m68k/fcntl.h
@@ -6,18 +6,6 @@
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_GETLK64 12 /* using 'struct flock64' */
10#define F_SETLK64 13
11#define F_SETLKW64 14
12
13struct flock64 {
14 short l_type;
15 short l_whence;
16 loff_t l_start;
17 loff_t l_len;
18 pid_t l_pid;
19};
20
21#include <asm-generic/fcntl.h> 9#include <asm-generic/fcntl.h>
22 10
23#endif /* _M68K_FCNTL_H */ 11#endif /* _M68K_FCNTL_H */
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h
index fb824bf09296..06c5d13faf66 100644
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
@@ -52,15 +52,6 @@ struct flock {
52 long pad[4]; 52 long pad[4];
53}; 53};
54 54
55typedef struct flock64 {
56 short l_type;
57 short l_whence;
58 loff_t l_start;
59 loff_t l_len;
60 pid_t l_pid;
61} flock64_t;
62
63
64#define HAVE_ARCH_STRUCT_FLOCK 55#define HAVE_ARCH_STRUCT_FLOCK
65 56
66#endif 57#endif
@@ -68,5 +59,8 @@ typedef struct flock64 {
68#include <asm-generic/fcntl.h> 59#include <asm-generic/fcntl.h>
69 60
70typedef struct flock flock_t; 61typedef struct flock flock_t;
62#ifndef __mips64
63typedef struct flock64 flock64_t;
64#endif
71 65
72#endif /* _ASM_FCNTL_H */ 66#endif /* _ASM_FCNTL_H */
diff --git a/include/asm-parisc/fcntl.h b/include/asm-parisc/fcntl.h
index eadda003c201..317851fa78f3 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 flock64 {
37 short l_type;
38 short l_whence;
39 loff_t l_start;
40 loff_t l_len;
41 pid_t l_pid;
42};
43
44#include <asm-generic/fcntl.h> 36#include <asm-generic/fcntl.h>
45 37
46#endif 38#endif
diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h
index 4480f21bfdea..7ef37443cc5c 100644
--- a/include/asm-ppc/fcntl.h
+++ b/include/asm-ppc/fcntl.h
@@ -6,20 +6,6 @@
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#ifndef __powerpc64__
10#define F_GETLK64 12 /* using 'struct flock64' */
11#define F_SETLK64 13
12#define F_SETLKW64 14
13
14struct flock64 {
15 short l_type;
16 short l_whence;
17 loff_t l_start;
18 loff_t l_len;
19 pid_t l_pid;
20};
21#endif
22
23#include <asm-generic/fcntl.h> 9#include <asm-generic/fcntl.h>
24 10
25#endif /* _PPC_FCNTL_H */ 11#endif /* _PPC_FCNTL_H */
diff --git a/include/asm-s390/fcntl.h b/include/asm-s390/fcntl.h
index 3a66fba09ee9..46ab12db5739 100644
--- a/include/asm-s390/fcntl.h
+++ b/include/asm-s390/fcntl.h
@@ -1,27 +1 @@
1/*
2 * include/asm-s390/fcntl.h
3 *
4 * S390 version
5 *
6 * Derived from "include/asm-i386/fcntl.h"
7 */
8#ifndef _S390_FCNTL_H
9#define _S390_FCNTL_H
10
11#ifndef __s390x__
12#define F_GETLK64 12 /* using 'struct flock64' */
13#define F_SETLK64 13
14#define F_SETLKW64 14
15
16struct flock64 {
17 short l_type;
18 short l_whence;
19 loff_t l_start;
20 loff_t l_len;
21 pid_t l_pid;
22};
23#endif
24
25#include <asm-generic/fcntl.h> #include <asm-generic/fcntl.h>
26
27#endif
diff --git a/include/asm-sh/fcntl.h b/include/asm-sh/fcntl.h
index c481bab8ba17..46ab12db5739 100644
--- a/include/asm-sh/fcntl.h
+++ b/include/asm-sh/fcntl.h
@@ -1,19 +1 @@
1#ifndef __ASM_SH_FCNTL_H
2#define __ASM_SH_FCNTL_H
3
4#define F_GETLK64 12 /* using 'struct flock64' */
5#define F_SETLK64 13
6#define F_SETLKW64 14
7
8struct flock64 {
9 short l_type;
10 short l_whence;
11 loff_t l_start;
12 loff_t l_len;
13 pid_t l_pid;
14};
15
16#include <asm-generic/fcntl.h> #include <asm-generic/fcntl.h>
17
18#endif /* __ASM_SH_FCNTL_H */
19
diff --git a/include/asm-sh64/fcntl.h b/include/asm-sh64/fcntl.h
index ffcc36c64fa5..744dd79b9d5d 100644
--- a/include/asm-sh64/fcntl.h
+++ b/include/asm-sh64/fcntl.h
@@ -1,7 +1 @@
1#ifndef __ASM_SH64_FCNTL_H
2#define __ASM_SH64_FCNTL_H
3
4#include <asm-sh/fcntl.h> #include <asm-sh/fcntl.h>
5
6#endif /* __ASM_SH64_FCNTL_H */
7
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
diff --git a/include/asm-v850/fcntl.h b/include/asm-v850/fcntl.h
index 0fd47f0c6a8a..3af4d56776dd 100644
--- a/include/asm-v850/fcntl.h
+++ b/include/asm-v850/fcntl.h
@@ -6,18 +6,6 @@
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_GETLK64 12 /* using 'struct flock64' */
10#define F_SETLK64 13
11#define F_SETLKW64 14
12
13struct flock64 {
14 short l_type;
15 short l_whence;
16 loff_t l_start;
17 loff_t l_len;
18 pid_t l_pid;
19};
20
21#include <asm-generic/fcntl.h> 9#include <asm-generic/fcntl.h>
22 10
23#endif /* __V850_FCNTL_H__ */ 11#endif /* __V850_FCNTL_H__ */
diff --git a/include/asm-xtensa/fcntl.h b/include/asm-xtensa/fcntl.h
index fdae0e170585..ec066ae96caf 100644
--- a/include/asm-xtensa/fcntl.h
+++ b/include/asm-xtensa/fcntl.h
@@ -54,6 +54,7 @@ struct flock64 {
54}; 54};
55 55
56#define HAVE_ARCH_STRUCT_FLOCK 56#define HAVE_ARCH_STRUCT_FLOCK
57#define HAVE_ARCH_STRUCT_FLOCK64
57 58
58#include <asm-generic/fcntl.h> 59#include <asm-generic/fcntl.h>
59 60
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 08:02:30 -0500