Skip to content

Commit

Permalink
[PATCH] Clean up struct flock64 definitions
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Stephen Rothwell authored and Linus Torvalds committed Sep 7, 2005
1 parent 5ac353f commit 8d286aa
Show file tree
Hide file tree
Showing 18 changed files with 30 additions and 223 deletions.
12 changes: 0 additions & 12 deletions include/asm-arm/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif
12 changes: 0 additions & 12 deletions include/asm-arm26/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,6 @@
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif
17 changes: 0 additions & 17 deletions include/asm-cris/fcntl.h
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
#ifndef _CRIS_FCNTL_H
#define _CRIS_FCNTL_H

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif
18 changes: 0 additions & 18 deletions include/asm-frv/fcntl.h
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
#ifndef _ASM_FCNTL_H
#define _ASM_FCNTL_H

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif /* _ASM_FCNTL_H */

25 changes: 25 additions & 0 deletions include/asm-generic/fcntl.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef _ASM_GENERIC_FCNTL_H
#define _ASM_GENERIC_FCNTL_H

#include <linux/config.h>
#include <linux/types.h>

/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
Expand Down Expand Up @@ -121,4 +122,28 @@ struct flock {
};
#endif

#ifndef CONFIG_64BIT

#ifndef F_GETLK64
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
#endif

#ifndef HAVE_ARCH_STRUCT_FLOCK64
#ifndef __ARCH_FLOCK64_PAD
#define __ARCH_FLOCK64_PAD
#endif

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
__ARCH_FLOCK64_PAD
};
#endif
#endif /* !CONFIG_64BIT */

#endif /* _ASM_GENERIC_FCNTL_H */
12 changes: 0 additions & 12 deletions include/asm-h8300/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif /* _H8300_FCNTL_H */
17 changes: 0 additions & 17 deletions include/asm-i386/fcntl.h
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
#ifndef _I386_FCNTL_H
#define _I386_FCNTL_H

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif
17 changes: 0 additions & 17 deletions include/asm-m32r/fcntl.h
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
#ifndef _ASM_M32R_FCNTL_H
#define _ASM_M32R_FCNTL_H

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif /* _ASM_M32R_FCNTL_H */
12 changes: 0 additions & 12 deletions include/asm-m68k/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif /* _M68K_FCNTL_H */
12 changes: 3 additions & 9 deletions include/asm-mips/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,15 @@ struct flock {
long pad[4];
};

typedef struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
} flock64_t;


#define HAVE_ARCH_STRUCT_FLOCK

#endif

#include <asm-generic/fcntl.h>

typedef struct flock flock_t;
#ifndef __mips64
typedef struct flock64 flock64_t;
#endif

#endif /* _ASM_FCNTL_H */
8 changes: 0 additions & 8 deletions include/asm-parisc/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@
#define F_WRLCK 02
#define F_UNLCK 03

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif
14 changes: 0 additions & 14 deletions include/asm-ppc/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,6 @@
#define O_LARGEFILE 0200000
#define O_DIRECT 0400000 /* direct disk access hint */

#ifndef __powerpc64__
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};
#endif

#include <asm-generic/fcntl.h>

#endif /* _PPC_FCNTL_H */
26 changes: 0 additions & 26 deletions include/asm-s390/fcntl.h
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1 @@
/*
* include/asm-s390/fcntl.h
*
* S390 version
*
* Derived from "include/asm-i386/fcntl.h"
*/
#ifndef _S390_FCNTL_H
#define _S390_FCNTL_H

#ifndef __s390x__
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};
#endif

#include <asm-generic/fcntl.h>

#endif
18 changes: 0 additions & 18 deletions include/asm-sh/fcntl.h
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
#ifndef __ASM_SH_FCNTL_H
#define __ASM_SH_FCNTL_H

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif /* __ASM_SH_FCNTL_H */

6 changes: 0 additions & 6 deletions include/asm-sh64/fcntl.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
#ifndef __ASM_SH64_FCNTL_H
#define __ASM_SH64_FCNTL_H

#include <asm-sh/fcntl.h>

#endif /* __ASM_SH64_FCNTL_H */

14 changes: 1 addition & 13 deletions include/asm-sparc/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 0 additions & 12 deletions include/asm-v850/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000

#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14

struct flock64 {
short l_type;
short l_whence;
loff_t l_start;
loff_t l_len;
pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif /* __V850_FCNTL_H__ */
1 change: 1 addition & 0 deletions include/asm-xtensa/fcntl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ struct flock64 {
};

#define HAVE_ARCH_STRUCT_FLOCK
#define HAVE_ARCH_STRUCT_FLOCK64

#include <asm-generic/fcntl.h>

Expand Down

0 comments on commit 8d286aa

Please sign in to comment.