[PATCH] Clean up struct flock definitions

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>

diff --git a/include/asm-alpha/fcntl.h b/include/asm-alpha/fcntl.h
index e2aacbb..87f2cf4 100644 (file)
--- a/include/asm-alpha/fcntl.h
+++ b/include/asm-alpha/fcntl.h
@@ -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

diff --git a/include/asm-arm/fcntl.h b/include/asm-arm/fcntl.h
index 6337df2..1816a6a 100644 (file)
--- a/include/asm-arm/fcntl.h
+++ b/include/asm-arm/fcntl.h
@@ -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;

diff --git a/include/asm-arm26/fcntl.h b/include/asm-arm26/fcntl.h
index 2f08302..b88f8d0 100644 (file)
--- a/include/asm-arm26/fcntl.h
+++ b/include/asm-arm26/fcntl.h
@@ -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;

diff --git a/include/asm-cris/fcntl.h b/include/asm-cris/fcntl.h
index e91b576..f8e7d13 100644 (file)
--- a/include/asm-cris/fcntl.h
+++ b/include/asm-cris/fcntl.h
@@ -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;

diff --git a/include/asm-frv/fcntl.h b/include/asm-frv/fcntl.h
index e552366..0b212d9 100644 (file)
--- a/include/asm-frv/fcntl.h
+++ b/include/asm-frv/fcntl.h
@@ -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;

diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index 1e66f92..b001d7f 100644 (file)
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -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 */

diff --git a/include/asm-h8300/fcntl.h b/include/asm-h8300/fcntl.h
index 805aaa0..8caeb05 100644 (file)
--- a/include/asm-h8300/fcntl.h
+++ b/include/asm-h8300/fcntl.h
@@ -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;

diff --git a/include/asm-i386/fcntl.h b/include/asm-i386/fcntl.h
index 1d06913..01f17d2 100644 (file)
--- a/include/asm-i386/fcntl.h
+++ b/include/asm-i386/fcntl.h
@@ -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;

diff --git a/include/asm-ia64/fcntl.h b/include/asm-ia64/fcntl.h
index a9d04ac..1dd275d 100644 (file)
--- a/include/asm-ia64/fcntl.h
+++ b/include/asm-ia64/fcntl.h
@@ -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)
 

diff --git a/include/asm-m32r/fcntl.h b/include/asm-m32r/fcntl.h
index ff3a084..90f7173 100644 (file)
--- a/include/asm-m32r/fcntl.h
+++ b/include/asm-m32r/fcntl.h
@@ -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;

diff --git a/include/asm-m68k/fcntl.h b/include/asm-m68k/fcntl.h
index 7dd8062..d3b24e3 100644 (file)
--- a/include/asm-m68k/fcntl.h
+++ b/include/asm-m68k/fcntl.h
@@ -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;

diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h
index be971d6..fb824bf 100644 (file)
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
@@ -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 */

diff --git a/include/asm-parisc/fcntl.h b/include/asm-parisc/fcntl.h
index 59a54ff..eadda00 100644 (file)
--- a/include/asm-parisc/fcntl.h
+++ b/include/asm-parisc/fcntl.h
@@ -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;

diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h
index 8549c03..4480f21 100644 (file)
--- a/include/asm-ppc/fcntl.h
+++ b/include/asm-ppc/fcntl.h
@@ -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;

diff --git a/include/asm-s390/fcntl.h b/include/asm-s390/fcntl.h
index 2974433..3a66fba 100644 (file)
--- a/include/asm-s390/fcntl.h
+++ b/include/asm-s390/fcntl.h
@@ -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;

diff --git a/include/asm-sh/fcntl.h b/include/asm-sh/fcntl.h
index 1db7b74..c481bab 100644 (file)
--- a/include/asm-sh/fcntl.h
+++ b/include/asm-sh/fcntl.h
@@ -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;

diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index 61334bf..6345573 100644 (file)
--- a/include/asm-sparc/fcntl.h
+++ b/include/asm-sparc/fcntl.h
@@ -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

diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h
index 3db10e0..b2aecf0 100644 (file)
--- a/include/asm-sparc64/fcntl.h
+++ b/include/asm-sparc64/fcntl.h
@@ -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>
 

diff --git a/include/asm-v850/fcntl.h b/include/asm-v850/fcntl.h
index 7001513..0fd47f0 100644 (file)
--- a/include/asm-v850/fcntl.h
+++ b/include/asm-v850/fcntl.h
@@ -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;

diff --git a/include/asm-x86_64/fcntl.h b/include/asm-x86_64/fcntl.h
index c7b09ea..46ab12d 100644 (file)
--- a/include/asm-x86_64/fcntl.h
+++ b/include/asm-x86_64/fcntl.h
@@ -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 */

diff --git a/include/asm-xtensa/fcntl.h b/include/asm-xtensa/fcntl.h
index 06f0dc9..fdae0e1 100644 (file)
--- a/include/asm-xtensa/fcntl.h
+++ b/include/asm-xtensa/fcntl.h
@@ -53,6 +53,8 @@ struct flock64 {
        pid_t  l_pid;
 };
 
+#define HAVE_ARCH_STRUCT_FLOCK
+
 #include <asm-generic/fcntl.h>
 
 #endif /* _XTENSA_FCNTL_H */