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

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

[PATCH] Clean up the fcntl operations 



This patch puts the most popular of each fcntl operation/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 e64ca97f

include/asm-arm/fcntl.h

+0 −21
Original line number Diff line number Diff line
@@ -6,31 +6,10 @@ 
#define O_DIRECT	0200000	/* direct disk access hint - currently ignored */

#define O_LARGEFILE	0400000



#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7



#define F_SETOWN	8	/*  for sockets. */

#define F_GETOWN	9	/*  for sockets. */

#define F_SETSIG	10	/*  for sockets. */

#define F_GETSIG	11	/*  for sockets. */



#define F_GETLK64	12	/*  using 'struct flock64' */

#define F_SETLK64	13

#define F_SETLKW64	14



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

#define F_RDLCK		0

#define F_WRLCK		1

#define F_UNLCK		2



/* for old implementation of bsd flock () */

#define F_EXLCK		4	/* or 3 */

#define F_SHLCK		8	/* or 4 */



/* for leases */

#define F_INPROGRESS	16



struct flock {

	short l_type;

	short l_whence;

include/asm-arm26/fcntl.h

+0 −21
Original line number Diff line number Diff line
@@ -8,31 +8,10 @@ 
#define O_DIRECT	0200000	/* direct disk access hint - currently ignored */

#define O_LARGEFILE	0400000



#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7



#define F_SETOWN	8	/*  for sockets. */

#define F_GETOWN	9	/*  for sockets. */

#define F_SETSIG	10	/*  for sockets. */

#define F_GETSIG	11	/*  for sockets. */



#define F_GETLK64	12	/*  using 'struct flock64' */

#define F_SETLK64	13

#define F_SETLKW64	14



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

#define F_RDLCK		0

#define F_WRLCK		1

#define F_UNLCK		2



/* for old implementation of bsd flock () */

#define F_EXLCK		4	/* or 3 */

#define F_SHLCK		8	/* or 4 */



/* for leases */

#define F_INPROGRESS	16



struct flock {

	short l_type;

	short l_whence;

include/asm-cris/fcntl.h

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

#define _CRIS_FCNTL_H



#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7



#define F_SETOWN	8	/*  for sockets. */

#define F_GETOWN	9	/*  for sockets. */

#define F_SETSIG	10	/*  for sockets. */

#define F_GETSIG	11	/*  for sockets. */



#define F_GETLK64      12      /*  using 'struct flock64' */

#define F_SETLK64      13

#define F_SETLKW64     14



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

#define F_RDLCK		0

#define F_WRLCK		1

#define F_UNLCK		2



/* for old implementation of bsd flock () */

#define F_EXLCK		4	/* or 3 */

#define F_SHLCK		8	/* or 4 */



/* for leases */

#define F_INPROGRESS   16



struct flock {

	short l_type;

	short l_whence;

include/asm-frv/fcntl.h

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

#define _ASM_FCNTL_H



#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7



#define F_SETOWN	8	/*  for sockets. */

#define F_GETOWN	9	/*  for sockets. */

#define F_SETSIG	10	/*  for sockets. */

#define F_GETSIG	11	/*  for sockets. */



#define F_GETLK64	12	/*  using 'struct flock64' */

#define F_SETLK64	13

#define F_SETLKW64	14



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

#define F_RDLCK		0

#define F_WRLCK		1

#define F_UNLCK		2



/* for old implementation of bsd flock () */

#define F_EXLCK		4	/* or 3 */

#define F_SHLCK		8	/* or 4 */



/* for leases */

#define F_INPROGRESS	16



struct flock {

	short l_type;

	short l_whence;

include/asm-generic/fcntl.h

+31 −0
Original line number Diff line number Diff line
@@ -55,10 +55,41 @@ 
#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 */

#ifndef F_GETLK

#define F_GETLK		5

#define F_SETLK		6

#define F_SETLKW	7

#endif

#ifndef F_SETOWN

#define F_SETOWN	8	/* for sockets. */

#define F_GETOWN	9	/* for sockets. */

#endif

#ifndef F_SETSIG

#define F_SETSIG	10	/* for sockets. */

#define F_GETSIG	11	/* for sockets. */

#endif



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

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



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

#ifndef F_RDLCK

#define F_RDLCK		0

#define F_WRLCK		1

#define F_UNLCK		2

#endif



/* for old implementation of bsd flock () */

#ifndef F_EXLCK

#define F_EXLCK		4	/* or 3 */

#define F_SHLCK		8	/* or 4 */

#endif



/* for leases */

#ifndef F_INPROGRESS

#define F_INPROGRESS	16

#endif



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

#define LOCK_SH		1	/* shared lock */

#define LOCK_EX		2	/* exclusive lock */