[PATCH] Clean up struct flock64 definitions

This patch gathers all the struct flock64 definitions (and the operations),
puts them under !CONFIG_64BIT and cleans up the arch files.

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, 1 insertions, 13 deletions

diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index 634557374e95..5db60b5ae7b0 100644
--- a/include/asm-sparc/fcntl.h
+++ b/include/asm-sparc/fcntl.h
@@ -23,25 +23,13 @@
 #define F_SETLK         8
 #define F_SETLKW        9
 
-#define F_GETLK64       12      /*  using 'struct flock64' */
-#define F_SETLK64       13
-#define F_SETLKW64      14
-
 /* for posix fcntl() and lockf() */
 #define F_RDLCK         1
 #define F_WRLCK         2
 #define F_UNLCK         3
 
-struct flock64 {
-        short l_type;
-        short l_whence;
-        loff_t l_start;
-        loff_t l_len;
-        pid_t l_pid;
-        short __unused;
-};
-
 #define __ARCH_FLOCK_PAD        short __unused;
+#define __ARCH_FLOCK64_PAD      short __unused;
 
 #include <asm-generic/fcntl.h>