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

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

[PATCH] Clean up the open flags 



This patch puts the most popular of each open flag into asm-generic/fcntl.h
and cleans up the arch files.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2b2fa38e

include/asm-alpha/fcntl.h

+0 −2
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ 


#define O_NONBLOCK	 00004

#define O_APPEND	 00010

#define O_NDELAY	O_NONBLOCK

#define O_SYNC		040000

#define FASYNC		020000	/* fcntl, for BSD compatibility */

#define O_DIRECTORY	0100000	/* must be a directory */

#define O_NOFOLLOW	0200000 /* don't follow links */

#define O_LARGEFILE	0400000 /* will be set by the kernel on every open */

include/asm-arm/fcntl.h

+0 −12
Original line number Diff line number Diff line 
#ifndef _ARM_FCNTL_H

#define _ARM_FCNTL_H



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

   located on an ext2 file system */

#define O_CREAT		   0100	/* not fcntl */

#define O_EXCL		   0200	/* not fcntl */

#define O_NOCTTY	   0400	/* not fcntl */

#define O_TRUNC		  01000	/* not fcntl */

#define O_APPEND	  02000

#define O_NONBLOCK	  04000

#define O_NDELAY	O_NONBLOCK

#define O_SYNC		 010000

#define FASYNC		 020000	/* fcntl, for BSD compatibility */

#define O_DIRECTORY	 040000	/* must be a directory */

#define O_NOFOLLOW	0100000	/* don't follow links */

#define O_DIRECT	0200000	/* direct disk access hint - currently ignored */

#define O_LARGEFILE	0400000

#define O_NOATIME	01000000



#define F_GETLK		5

#define F_SETLK		6

include/asm-arm26/fcntl.h

+0 −10
Original line number Diff line number Diff line
@@ -3,20 +3,10 @@ 


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

   located on an ext2 file system */

#define O_CREAT		   0100	/* not fcntl */

#define O_EXCL		   0200	/* not fcntl */

#define O_NOCTTY	   0400	/* not fcntl */

#define O_TRUNC		  01000	/* not fcntl */

#define O_APPEND	  02000

#define O_NONBLOCK	  04000

#define O_NDELAY	O_NONBLOCK

#define O_SYNC		 010000

#define FASYNC		 020000	/* fcntl, for BSD compatibility */

#define O_DIRECTORY	 040000	/* must be a directory */

#define O_NOFOLLOW	0100000	/* don't follow links */

#define O_DIRECT	0200000	/* direct disk access hint - currently ignored */

#define O_LARGEFILE	0400000

#define O_NOATIME	01000000



#define F_GETLK		5

#define F_SETLK		6

include/asm-cris/fcntl.h

+0 −19
Original line number Diff line number Diff line 
#ifndef _CRIS_FCNTL_H

#define _CRIS_FCNTL_H



/* verbatim copy of i386 version */



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

   located on an ext2 file system */

#define O_CREAT		   0100	/* not fcntl */

#define O_EXCL		   0200	/* not fcntl */

#define O_NOCTTY	   0400	/* not fcntl */

#define O_TRUNC		  01000	/* not fcntl */

#define O_APPEND	  02000

#define O_NONBLOCK	  04000

#define O_NDELAY	O_NONBLOCK

#define O_SYNC		 010000

#define FASYNC		 020000	/* fcntl, for BSD compatibility */

#define O_DIRECT	 040000	/* direct disk access hint - currently ignored */

#define O_LARGEFILE	0100000

#define O_DIRECTORY	0200000	/* must be a directory */

#define O_NOFOLLOW	0400000 /* don't follow links */

#define O_NOATIME	01000000



#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7

include/asm-frv/fcntl.h

+0 −17
Original line number Diff line number Diff line 
#ifndef _ASM_FCNTL_H

#define _ASM_FCNTL_H



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

   located on an ext2 file system */

#define O_CREAT		   0100	/* not fcntl */

#define O_EXCL		   0200	/* not fcntl */

#define O_NOCTTY	   0400	/* not fcntl */

#define O_TRUNC		  01000	/* not fcntl */

#define O_APPEND	  02000

#define O_NONBLOCK	  04000

#define O_NDELAY	O_NONBLOCK

#define O_SYNC		 010000

#define FASYNC		 020000	/* fcntl, for BSD compatibility */

#define O_DIRECT	 040000	/* direct disk access hint */

#define O_LARGEFILE	0100000

#define O_DIRECTORY	0200000	/* must be a directory */

#define O_NOFOLLOW	0400000 /* don't follow links */

#define O_NOATIME	01000000



#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7