Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

[PATCH] Clean up struct flock definitions

Browse source 
This patch just gathers together all the struct flock definitions except
xtensa into asm-generic/fcntl.h.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Stephen Rothwell 2005-09-06 15:18:00 -07:00 committed by Linus Torvalds
parent 1abf62afb6
commit 5ac353f9ba
21 changed files with 26 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/asm-alpha/fcntl.h
View file

@ -37,14 +37,6 @@
#define F_INPROGRESS 64
struct flock {
short l_type;
short l_whence;
__kernel_off_t l_start;
__kernel_off_t l_len;
__kernel_pid_t l_pid;
};
#include <asm-generic/fcntl.h>
#endif

8
include/asm-arm/fcntl.h
View file

@ -10,14 +10,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

8
include/asm-arm26/fcntl.h
View file

@ -12,14 +12,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

8
include/asm-cris/fcntl.h
View file

@ -5,14 +5,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

8
include/asm-frv/fcntl.h
View file

@ -5,14 +5,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

17
include/asm-generic/fcntl.h
View file

@ -1,6 +1,8 @@
#ifndef _ASM_GENERIC_FCNTL_H
#define _ASM_GENERIC_FCNTL_H
#include <linux/types.h>
/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
located on an ext2 file system */
#define O_ACCMODE 00000003
@ -104,4 +106,19 @@
#define F_LINUX_SPECIFIC_BASE 1024
#ifndef HAVE_ARCH_STRUCT_FLOCK
#ifndef __ARCH_FLOCK_PAD
#define __ARCH_FLOCK_PAD
#endif
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
__ARCH_FLOCK_PAD
};
#endif
#endif /* _ASM_GENERIC_FCNTL_H */

8
include/asm-h8300/fcntl.h
View file

@ -10,14 +10,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

8
include/asm-i386/fcntl.h
View file

@ -5,14 +5,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

8
include/asm-ia64/fcntl.h
View file

@ -5,14 +5,6 @@
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
*/
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
#define force_o_largefile() \
(personality(current->personality) != PER_LINUX32)

12
include/asm-m32r/fcntl.h
View file

@ -1,22 +1,10 @@
#ifndef _ASM_M32R_FCNTL_H
#define _ASM_M32R_FCNTL_H
/* $Id$ */
/* orig : i386 2.4.18 */
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

8
include/asm-m68k/fcntl.h
View file

@ -10,14 +10,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

17
include/asm-mips/fcntl.h
View file

@ -50,7 +50,7 @@ struct flock {
long l_sysid;
__kernel_pid_t l_pid;
long pad[4];
} flock_t;
};
typedef struct flock64 {
short l_type;
@ -60,22 +60,13 @@ typedef struct flock64 {
pid_t l_pid;
} flock64_t;
#else /* 64-bit definitions */
typedef struct flock {
short l_type;
short l_whence;
__kernel_off_t l_start;
__kernel_off_t l_len;
__kernel_pid_t l_pid;
} flock_t;
#ifdef __KERNEL__
#define flock64 flock
#endif
#define HAVE_ARCH_STRUCT_FLOCK
#endif
#include <asm-generic/fcntl.h>
typedef struct flock flock_t;
#endif /* _ASM_FCNTL_H */

8
include/asm-parisc/fcntl.h
View file

@ -33,14 +33,6 @@
#define F_WRLCK 02
#define F_UNLCK 03
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

10
include/asm-ppc/fcntl.h
View file

@ -10,17 +10,7 @@
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
#endif
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
#ifndef __powerpc64__
struct flock64 {
short l_type;
short l_whence;

10
include/asm-s390/fcntl.h
View file

@ -12,17 +12,7 @@
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
#endif /* ! __s390x__ */
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
#ifndef __s390x__
struct flock64 {
short l_type;
short l_whence;

8
include/asm-sh/fcntl.h
View file

@ -5,14 +5,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

11
include/asm-sparc/fcntl.h
View file

@ -32,15 +32,6 @@
#define F_WRLCK 2
#define F_UNLCK 3
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
short __unused;
};
struct flock64 {
short l_type;
short l_whence;
@ -50,6 +41,8 @@ struct flock64 {
short __unused;
};
#define __ARCH_FLOCK_PAD short __unused;
#include <asm-generic/fcntl.h>
#endif

9
include/asm-sparc64/fcntl.h
View file

@ -29,14 +29,7 @@
#define F_WRLCK 2
#define F_UNLCK 3
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
short __unused;
};
#define __ARCH_FLOCK_PAD short __unused;
#include <asm-generic/fcntl.h>

8
include/asm-v850/fcntl.h
View file

@ -10,14 +10,6 @@
#define F_SETLK64 13
#define F_SETLKW64 14
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
struct flock64 {
short l_type;
short l_whence;

13
include/asm-x86_64/fcntl.h
View file

@ -1,14 +1 @@
#ifndef _X86_64_FCNTL_H
#define _X86_64_FCNTL_H
struct flock {
short l_type;
short l_whence;
off_t l_start;
off_t l_len;
pid_t l_pid;
};
#include <asm-generic/fcntl.h>
#endif /* !_X86_64_FCNTL_H */

2
include/asm-xtensa/fcntl.h
View file

@ -53,6 +53,8 @@ struct flock64 {
pid_t l_pid;
};
#define HAVE_ARCH_STRUCT_FLOCK
#include <asm-generic/fcntl.h>
#endif /* _XTENSA_FCNTL_H */