Skip to content

K
Kernel

openeuler / Kernel
大约 1 年 前同步成功

通知 5
Star 0
Fork 0
K
Kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 8d286aa5 编写于 作者: S Stephen Rothwell 提交者： Linus Torvalds
浏览文件
操作

[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: NStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 5ac353f9
隐藏空白更改
内联 并排
Showing with 30 addition and 223 deletion
include/asm-arm/fcntl.h
浏览文件 @ 8d286aa5
......@@ -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
浏览文件 @ 8d286aa5
......@@ -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
浏览文件 @ 8d286aa5
#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
浏览文件 @ 8d286aa5
#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
浏览文件 @ 8d286aa5
#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 */
include/asm-h8300/fcntl.h
浏览文件 @ 8d286aa5
......@@ -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 */
include/asm-i386/fcntl.h
浏览文件 @ 8d286aa5
#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
include/asm-m32r/fcntl.h
浏览文件 @ 8d286aa5
#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 */
include/asm-m68k/fcntl.h
浏览文件 @ 8d286aa5
......@@ -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 */
include/asm-mips/fcntl.h
浏览文件 @ 8d286aa5
......@@ -52,15 +52,6 @@ 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
......@@ -68,5 +59,8 @@ typedef struct flock64 {
#include <asm-generic/fcntl.h>
typedef struct flock flock_t;
#ifndef __mips64
typedef struct flock64 flock64_t;
#endif
#endif /* _ASM_FCNTL_H */
include/asm-parisc/fcntl.h
浏览文件 @ 8d286aa5
......@@ -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
include/asm-ppc/fcntl.h
浏览文件 @ 8d286aa5
......@@ -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 */
include/asm-s390/fcntl.h
浏览文件 @ 8d286aa5
/*
* 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
include/asm-sh/fcntl.h
浏览文件 @ 8d286aa5
#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 */
include/asm-sh64/fcntl.h
浏览文件 @ 8d286aa5
#ifndef __ASM_SH64_FCNTL_H
#define __ASM_SH64_FCNTL_H
#include <asm-sh/fcntl.h>
#endif /* __ASM_SH64_FCNTL_H */
include/asm-sparc/fcntl.h
浏览文件 @ 8d286aa5
......@@ -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>
......
include/asm-v850/fcntl.h
浏览文件 @ 8d286aa5
......@@ -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__ */
include/asm-xtensa/fcntl.h
浏览文件 @ 8d286aa5
......@@ -54,6 +54,7 @@ struct flock64 {
};
#define HAVE_ARCH_STRUCT_FLOCK
#define HAVE_ARCH_STRUCT_FLOCK64
#include <asm-generic/fcntl.h>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或