[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>

1 files changed, 2 insertions, 9 deletions

diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index 61334bff18c4..634557374e95 100644
--- 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