diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-06 18:17:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:37 -0400 |
commit | 9317259ead88fe6c05120ae1e3ace99738e2c698 (patch) | |
tree | b899748ca57a96d59003945f97ceae01b5fdc48c /include/asm-v850/fcntl.h | |
parent | 5ba4d46dc44c5399bc4e7a39239de5a1690848a4 (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-v850/fcntl.h')
-rw-r--r-- | include/asm-v850/fcntl.h | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/include/asm-v850/fcntl.h b/include/asm-v850/fcntl.h index 31d4b5961221..1a39a0cb9ce5 100644 --- a/include/asm-v850/fcntl.h +++ b/include/asm-v850/fcntl.h | |||
@@ -3,10 +3,6 @@ | |||
3 | 3 | ||
4 | /* open/fcntl - O_SYNC is only implemented on blocks devices and on files | 4 | /* open/fcntl - O_SYNC is only implemented on blocks devices and on files |
5 | located on an ext2 file system */ | 5 | located on an ext2 file system */ |
6 | #define O_ACCMODE 0003 | ||
7 | #define O_RDONLY 00 | ||
8 | #define O_WRONLY 01 | ||
9 | #define O_RDWR 02 | ||
10 | #define O_CREAT 0100 /* not fcntl */ | 6 | #define O_CREAT 0100 /* not fcntl */ |
11 | #define O_EXCL 0200 /* not fcntl */ | 7 | #define O_EXCL 0200 /* not fcntl */ |
12 | #define O_NOCTTY 0400 /* not fcntl */ | 8 | #define O_NOCTTY 0400 /* not fcntl */ |
@@ -22,11 +18,6 @@ | |||
22 | #define O_LARGEFILE 0400000 | 18 | #define O_LARGEFILE 0400000 |
23 | #define O_NOATIME 01000000 | 19 | #define O_NOATIME 01000000 |
24 | 20 | ||
25 | #define F_DUPFD 0 /* dup */ | ||
26 | #define F_GETFD 1 /* get close_on_exec */ | ||
27 | #define F_SETFD 2 /* set/clear close_on_exec */ | ||
28 | #define F_GETFL 3 /* get file->f_flags */ | ||
29 | #define F_SETFL 4 /* set file->f_flags */ | ||
30 | #define F_GETLK 5 | 21 | #define F_GETLK 5 |
31 | #define F_SETLK 6 | 22 | #define F_SETLK 6 |
32 | #define F_SETLKW 7 | 23 | #define F_SETLKW 7 |
@@ -40,9 +31,6 @@ | |||
40 | #define F_SETLK64 13 | 31 | #define F_SETLK64 13 |
41 | #define F_SETLKW64 14 | 32 | #define F_SETLKW64 14 |
42 | 33 | ||
43 | /* for F_[GET|SET]FL */ | ||
44 | #define FD_CLOEXEC 1 /* actually anything with low bit set goes */ | ||
45 | |||
46 | /* for posix fcntl() and lockf() */ | 34 | /* for posix fcntl() and lockf() */ |
47 | #define F_RDLCK 0 | 35 | #define F_RDLCK 0 |
48 | #define F_WRLCK 1 | 36 | #define F_WRLCK 1 |
@@ -55,18 +43,6 @@ | |||
55 | /* for leases */ | 43 | /* for leases */ |
56 | #define F_INPROGRESS 16 | 44 | #define F_INPROGRESS 16 |
57 | 45 | ||
58 | /* operations for bsd flock(), also used by the kernel implementation */ | ||
59 | #define LOCK_SH 1 /* shared lock */ | ||
60 | #define LOCK_EX 2 /* exclusive lock */ | ||
61 | #define LOCK_NB 4 /* or'd with one of the above to prevent | ||
62 | blocking */ | ||
63 | #define LOCK_UN 8 /* remove lock */ | ||
64 | |||
65 | #define LOCK_MAND 32 /* This is a mandatory flock */ | ||
66 | #define LOCK_READ 64 /* ... Which allows concurrent read operations */ | ||
67 | #define LOCK_WRITE 128 /* ... Which allows concurrent write operations */ | ||
68 | #define LOCK_RW 192 /* ... Which allows concurrent read & write ops */ | ||
69 | |||
70 | struct flock { | 46 | struct flock { |
71 | short l_type; | 47 | short l_type; |
72 | short l_whence; | 48 | short l_whence; |
@@ -83,5 +59,6 @@ struct flock64 { | |||
83 | pid_t l_pid; | 59 | pid_t l_pid; |
84 | }; | 60 | }; |
85 | 61 | ||
86 | #define F_LINUX_SPECIFIC_BASE 1024 | 62 | #include <asm-generic/fcntl.h> |
63 | |||
87 | #endif /* __V850_FCNTL_H__ */ | 64 | #endif /* __V850_FCNTL_H__ */ |