aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-s390/fcntl.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-06 18:17:57 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 19:57:37 -0400
commit9317259ead88fe6c05120ae1e3ace99738e2c698 (patch)
treeb899748ca57a96d59003945f97ceae01b5fdc48c /include/asm-s390/fcntl.h
parent5ba4d46dc44c5399bc4e7a39239de5a1690848a4 (diff)
[PATCH] Create asm-generic/fcntl.h
This set of patches creates asm-generic/fcntl.h and consolidates as much as possible from the asm-*/fcntl.h files into it. This patch just gathers all the identical bits of the asm-*/fcntl.h files into asm-generic/fcntl.h. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-s390/fcntl.h')
-rw-r--r--include/asm-s390/fcntl.h28
1 files changed, 3 insertions, 25 deletions
diff --git a/include/asm-s390/fcntl.h b/include/asm-s390/fcntl.h
index 48f692b4573..159979f3509 100644
--- a/include/asm-s390/fcntl.h
+++ b/include/asm-s390/fcntl.h
@@ -10,10 +10,6 @@
10 10
11/* open/fcntl - O_SYNC is only implemented on blocks devices and on files 11/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
12 located on an ext2 file system */ 12 located on an ext2 file system */
13#define O_ACCMODE 0003
14#define O_RDONLY 00
15#define O_WRONLY 01
16#define O_RDWR 02
17#define O_CREAT 0100 /* not fcntl */ 13#define O_CREAT 0100 /* not fcntl */
18#define O_EXCL 0200 /* not fcntl */ 14#define O_EXCL 0200 /* not fcntl */
19#define O_NOCTTY 0400 /* not fcntl */ 15#define O_NOCTTY 0400 /* not fcntl */
@@ -29,11 +25,6 @@
29#define O_NOFOLLOW 0400000 /* don't follow links */ 25#define O_NOFOLLOW 0400000 /* don't follow links */
30#define O_NOATIME 01000000 26#define O_NOATIME 01000000
31 27
32#define F_DUPFD 0 /* dup */
33#define F_GETFD 1 /* get close_on_exec */
34#define F_SETFD 2 /* set/clear close_on_exec */
35#define F_GETFL 3 /* get file->f_flags */
36#define F_SETFL 4 /* set file->f_flags */
37#define F_GETLK 5 28#define F_GETLK 5
38#define F_SETLK 6 29#define F_SETLK 6
39#define F_SETLKW 7 30#define F_SETLKW 7
@@ -49,9 +40,6 @@
49#define F_SETLKW64 14 40#define F_SETLKW64 14
50#endif /* ! __s390x__ */ 41#endif /* ! __s390x__ */
51 42
52/* for F_[GET|SET]FL */
53#define FD_CLOEXEC 1 /* actually anything with low bit set goes */
54
55/* for posix fcntl() and lockf() */ 43/* for posix fcntl() and lockf() */
56#define F_RDLCK 0 44#define F_RDLCK 0
57#define F_WRLCK 1 45#define F_WRLCK 1
@@ -64,18 +52,6 @@
64/* for leases */ 52/* for leases */
65#define F_INPROGRESS 16 53#define F_INPROGRESS 16
66 54
67/* operations for bsd flock(), also used by the kernel implementation */
68#define LOCK_SH 1 /* shared lock */
69#define LOCK_EX 2 /* exclusive lock */
70#define LOCK_NB 4 /* or'd with one of the above to prevent
71 blocking */
72#define LOCK_UN 8 /* remove lock */
73
74#define LOCK_MAND 32 /* This is a mandatory flock */
75#define LOCK_READ 64 /* ... Which allows concurrent read operations */
76#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */
77#define LOCK_RW 192 /* ... Which allows concurrent read & write ops */
78
79struct flock { 55struct flock {
80 short l_type; 56 short l_type;
81 short l_whence; 57 short l_whence;
@@ -93,5 +69,7 @@ struct flock64 {
93 pid_t l_pid; 69 pid_t l_pid;
94}; 70};
95#endif 71#endif
96#define F_LINUX_SPECIFIC_BASE 1024 72
73#include <asm-generic/fcntl.h>
74
97#endif 75#endif