Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9317259e authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarYoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5ba4d46d

include/asm-alpha/fcntl.h

+1 −24
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 


/* open/fcntl - O_SYNC is only implemented on blocks devices and on files

   located on an ext2 file system */

#define O_ACCMODE	  0003

#define O_RDONLY	    00

#define O_WRONLY	    01

#define O_RDWR		    02

#define O_CREAT		 01000	/* not fcntl */

#define O_TRUNC		 02000	/* not fcntl */

#define O_EXCL		 04000	/* not fcntl */
@@ -23,11 +19,6 @@ 
#define O_DIRECT	02000000 /* direct disk access - should check with OSF/1 */

#define O_NOATIME	04000000



#define F_DUPFD		0	/* dup */

#define F_GETFD		1	/* get close_on_exec */

#define F_SETFD		2	/* set/clear close_on_exec */

#define F_GETFL		3	/* get file->f_flags */

#define F_SETFL		4       /* set file->f_flags */

#define F_GETLK		7

#define F_SETLK		8

#define F_SETLKW	9
@@ -37,9 +28,6 @@ 
#define F_SETSIG	10	/*  for sockets. */

#define F_GETSIG	11	/*  for sockets. */



/* for F_[GET|SET]FL */

#define FD_CLOEXEC	1	/* actually anything with low bit set goes */



/* for posix fcntl() and lockf() */

#define F_RDLCK		1

#define F_WRLCK		2
@@ -51,17 +39,6 @@ 


#define F_INPROGRESS	64



/* operations for bsd flock(), also used by the kernel implementation */

#define LOCK_SH		1	/* shared lock */

#define LOCK_EX		2	/* exclusive lock */

#define LOCK_NB		4	/* or'd with one of the above to prevent

				   blocking */

#define LOCK_UN		8	/* remove lock */

#define LOCK_MAND      32      /* This is a mandatory flock */

#define LOCK_READ      64      /* ... Which allows concurrent read operations */

#define LOCK_WRITE     128     /* ... Which allows concurrent write operations */

#define LOCK_RW        192     /* ... Which allows concurrent read & write ops */

 

struct flock {

	short l_type;

	short l_whence;
@@ -70,6 +47,6 @@ struct flock { 
	__kernel_pid_t l_pid;

};



#define F_LINUX_SPECIFIC_BASE  1024

#include <asm-generic/fcntl.h>



#endif

include/asm-arm/fcntl.h

+2 −25
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 


/* open/fcntl - O_SYNC is only implemented on blocks devices and on files

   located on an ext2 file system */

#define O_ACCMODE	   0003

#define O_RDONLY	     00

#define O_WRONLY	     01

#define O_RDWR		     02

#define O_CREAT		   0100	/* not fcntl */

#define O_EXCL		   0200	/* not fcntl */

#define O_NOCTTY	   0400	/* not fcntl */
@@ -22,11 +18,6 @@ 
#define O_LARGEFILE	0400000

#define O_NOATIME	01000000



#define F_DUPFD		0	/* dup */

#define F_GETFD		1	/* get close_on_exec */

#define F_SETFD		2	/* set/clear close_on_exec */

#define F_GETFL		3	/* get file->f_flags */

#define F_SETFL		4	/* set file->f_flags */

#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7
@@ -40,9 +31,6 @@ 
#define F_SETLK64	13

#define F_SETLKW64	14



/* for F_[GET|SET]FL */

#define FD_CLOEXEC	1	/* actually anything with low bit set goes */



/* for posix fcntl() and lockf() */

#define F_RDLCK		0

#define F_WRLCK		1
@@ -55,18 +43,6 @@ 
/* for leases */

#define F_INPROGRESS	16



/* operations for bsd flock(), also used by the kernel implementation */

#define LOCK_SH		1	/* shared lock */

#define LOCK_EX		2	/* exclusive lock */

#define LOCK_NB		4	/* or'd with one of the above to prevent

				   blocking */

#define LOCK_UN		8	/* remove lock */



#define LOCK_MAND	32	/* This is a mandatory flock */

#define LOCK_READ	64	/* ... Which allows concurrent read operations */

#define LOCK_WRITE	128	/* ... Which allows concurrent write operations */

#define LOCK_RW		192	/* ... Which allows concurrent read & write ops */



struct flock {

	short l_type;

	short l_whence;
@@ -83,5 +59,6 @@ struct flock64 { 
	pid_t  l_pid;

};



#define F_LINUX_SPECIFIC_BASE	1024

#include <asm-generic/fcntl.h>



#endif

include/asm-arm26/fcntl.h

+2 −25
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 


/* open/fcntl - O_SYNC is only implemented on blocks devices and on files

   located on an ext2 file system */

#define O_ACCMODE	   0003

#define O_RDONLY	     00

#define O_WRONLY	     01

#define O_RDWR		     02

#define O_CREAT		   0100	/* not fcntl */

#define O_EXCL		   0200	/* not fcntl */

#define O_NOCTTY	   0400	/* not fcntl */
@@ -22,11 +18,6 @@ 
#define O_LARGEFILE	0400000

#define O_NOATIME	01000000



#define F_DUPFD		0	/* dup */

#define F_GETFD		1	/* get close_on_exec */

#define F_SETFD		2	/* set/clear close_on_exec */

#define F_GETFL		3	/* get file->f_flags */

#define F_SETFL		4	/* set file->f_flags */

#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7
@@ -40,9 +31,6 @@ 
#define F_SETLK64	13

#define F_SETLKW64	14



/* for F_[GET|SET]FL */

#define FD_CLOEXEC	1	/* actually anything with low bit set goes */



/* for posix fcntl() and lockf() */

#define F_RDLCK		0

#define F_WRLCK		1
@@ -55,18 +43,6 @@ 
/* for leases */

#define F_INPROGRESS	16



/* operations for bsd flock(), also used by the kernel implementation */

#define LOCK_SH		1	/* shared lock */

#define LOCK_EX		2	/* exclusive lock */

#define LOCK_NB		4	/* or'd with one of the above to prevent

				   blocking */

#define LOCK_UN		8	/* remove lock */



#define LOCK_MAND	32	/* This is a mandatory flock */

#define LOCK_READ	64	/* ... Which allows concurrent read operations */

#define LOCK_WRITE	128	/* ... Which allows concurrent write operations */

#define LOCK_RW		192	/* ... Which allows concurrent read & write ops */



struct flock {

	short l_type;

	short l_whence;
@@ -83,5 +59,6 @@ struct flock64 { 
	pid_t  l_pid;

};



#define F_LINUX_SPECIFIC_BASE	1024

#include <asm-generic/fcntl.h>



#endif

include/asm-cris/fcntl.h

+1 −25
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ 


/* open/fcntl - O_SYNC is only implemented on blocks devices and on files

   located on an ext2 file system */

#define O_ACCMODE	   0003

#define O_RDONLY	     00

#define O_WRONLY	     01

#define O_RDWR		     02

#define O_CREAT		   0100	/* not fcntl */

#define O_EXCL		   0200	/* not fcntl */

#define O_NOCTTY	   0400	/* not fcntl */
@@ -24,11 +20,6 @@ 
#define O_NOFOLLOW	0400000 /* don't follow links */

#define O_NOATIME	01000000



#define F_DUPFD		0	/* dup */

#define F_GETFD		1	/* get f_flags */

#define F_SETFD		2	/* set f_flags */

#define F_GETFL		3	/* more flags (cloexec) */

#define F_SETFL		4

#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7
@@ -42,9 +33,6 @@ 
#define F_SETLK64      13

#define F_SETLKW64     14



/* for F_[GET|SET]FL */

#define FD_CLOEXEC	1	/* actually anything with low bit set goes */



/* for posix fcntl() and lockf() */

#define F_RDLCK		0

#define F_WRLCK		1
@@ -57,18 +45,6 @@ 
/* for leases */

#define F_INPROGRESS   16



/* operations for bsd flock(), also used by the kernel implementation */

#define LOCK_SH		1	/* shared lock */

#define LOCK_EX		2	/* exclusive lock */

#define LOCK_NB		4	/* or'd with one of the above to prevent

				   blocking */

#define LOCK_UN		8	/* remove lock */



#define LOCK_MAND      32      /* This is a mandatory flock */

#define LOCK_READ      64      /* ... Which allows concurrent read operations */

#define LOCK_WRITE     128     /* ... Which allows concurrent write operations */

#define LOCK_RW        192     /* ... Which allows concurrent read & write ops */



struct flock {

	short l_type;

	short l_whence;
@@ -85,6 +61,6 @@ struct flock64 { 
	pid_t  l_pid;

};



#define F_LINUX_SPECIFIC_BASE  1024

#include <asm-generic/fcntl.h>



#endif

include/asm-frv/fcntl.h

+2 −25
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 


/* open/fcntl - O_SYNC is only implemented on blocks devices and on files

   located on an ext2 file system */

#define O_ACCMODE	   0003

#define O_RDONLY	     00

#define O_WRONLY	     01

#define O_RDWR		     02

#define O_CREAT		   0100	/* not fcntl */

#define O_EXCL		   0200	/* not fcntl */

#define O_NOCTTY	   0400	/* not fcntl */
@@ -22,11 +18,6 @@ 
#define O_NOFOLLOW	0400000 /* don't follow links */

#define O_NOATIME	01000000



#define F_DUPFD		0	/* dup */

#define F_GETFD		1	/* get close_on_exec */

#define F_SETFD		2	/* set/clear close_on_exec */

#define F_GETFL		3	/* get file->f_flags */

#define F_SETFL		4	/* set file->f_flags */

#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7
@@ -40,9 +31,6 @@ 
#define F_SETLK64	13

#define F_SETLKW64	14



/* for F_[GET|SET]FL */

#define FD_CLOEXEC	1	/* actually anything with low bit set goes */



/* for posix fcntl() and lockf() */

#define F_RDLCK		0

#define F_WRLCK		1
@@ -55,18 +43,6 @@ 
/* for leases */

#define F_INPROGRESS	16



/* operations for bsd flock(), also used by the kernel implementation */

#define LOCK_SH		1	/* shared lock */

#define LOCK_EX		2	/* exclusive lock */

#define LOCK_NB		4	/* or'd with one of the above to prevent

				   blocking */

#define LOCK_UN		8	/* remove lock */



#define LOCK_MAND	32	/* This is a mandatory flock */

#define LOCK_READ	64	/* ... Which allows concurrent read operations */

#define LOCK_WRITE	128	/* ... Which allows concurrent write operations */

#define LOCK_RW		192	/* ... Which allows concurrent read & write ops */



struct flock {

	short l_type;

	short l_whence;
@@ -83,6 +59,7 @@ struct flock64 { 
	pid_t  l_pid;

};



#define F_LINUX_SPECIFIC_BASE	1024

#include <asm-generic/fcntl.h>



#endif /* _ASM_FCNTL_H */