Commit 8d286aa5 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5ac353f9

include/asm-arm/fcntl.h

+0 −12
Original line number Diff line number Diff line
@@ -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

include/asm-arm26/fcntl.h

+0 −12
Original line number Diff line number Diff line
@@ -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

include/asm-cris/fcntl.h

+0 −17
Original line number Diff line number Diff line 
#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

include/asm-frv/fcntl.h

+0 −18
Original line number Diff line number Diff line 
#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 */

include/asm-generic/fcntl.h

+25 −0
Original line number Diff line number Diff line 
#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
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE