Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ac353f9 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[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: 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 1abf62af
Loading
Loading
Loading
Loading
+0 −8
Original line number Diff line number Diff line
@@ -37,14 +37,6 @@

#define F_INPROGRESS	64

struct flock {
	short l_type;
	short l_whence;
	__kernel_off_t l_start;
	__kernel_off_t l_len;
	__kernel_pid_t l_pid;
};

#include <asm-generic/fcntl.h>

#endif
+0 −8
Original line number Diff line number Diff line
@@ -10,14 +10,6 @@
#define F_SETLK64	13
#define F_SETLKW64	14

struct flock {
	short l_type;
	short l_whence;
	off_t l_start;
	off_t l_len;
	pid_t l_pid;
};

struct flock64 {
	short  l_type;
	short  l_whence;
+0 −8
Original line number Diff line number Diff line
@@ -12,14 +12,6 @@
#define F_SETLK64	13
#define F_SETLKW64	14

struct flock {
	short l_type;
	short l_whence;
	off_t l_start;
	off_t l_len;
	pid_t l_pid;
};

struct flock64 {
	short  l_type;
	short  l_whence;
+0 −8
Original line number Diff line number Diff line
@@ -5,14 +5,6 @@
#define F_SETLK64      13
#define F_SETLKW64     14

struct flock {
	short l_type;
	short l_whence;
	off_t l_start;
	off_t l_len;
	pid_t l_pid;
};

struct flock64 {
	short  l_type;
	short  l_whence;
+0 −8
Original line number Diff line number Diff line
@@ -5,14 +5,6 @@
#define F_SETLK64	13
#define F_SETLKW64	14

struct flock {
	short l_type;
	short l_whence;
	off_t l_start;
	off_t l_len;
	pid_t l_pid;
};

struct flock64 {
	short  l_type;
	short  l_whence;
Loading