patch-2.4.20 linux-2.4.20/include/asm-mips/fcntl.h

• Lines: 35
• Date: Thu Nov 28 15:53:15 2002
• Orig file: linux-2.4.19/include/asm-mips/fcntl.h
• Orig date: Fri Aug 2 17:39:45 2002

diff -urN linux-2.4.19/include/asm-mips/fcntl.h linux-2.4.20/include/asm-mips/fcntl.h
@@ -65,7 +65,7 @@
 /* operations for bsd flock(), also used by the kernel implementation */
 #define LOCK_SH		1	/* shared lock */
 #define LOCK_EX		2	/* exclusive lock */
-#define LOCK_NB		4	/* or'd with one of the above to prevent		XXXXXXXXXXXXXXXXXX
+#define LOCK_NB		4	/* or'd with one of the above to prevent
 				   blocking */
 #define LOCK_UN		8	/* remove lock */
 
@@ -74,14 +74,21 @@
 #define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
 #define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
 
+/*
+ * The flavours of struct flock.  "struct flock" is the ABI compliant
+ * variant.  Finally struct flock64 is the LFS variant of struct flock.  As
+ * a historic accident and inconsistence with the ABI definition it doesn't
+ * contain all the same fields as struct flock.
+ */
+
 typedef struct flock {
-	short l_type;
-	short l_whence;
+	short	l_type;
+	short	l_whence;
 	__kernel_off_t l_start;
 	__kernel_off_t l_len;
-	long  l_sysid;			/* ABI junk, unused on Linux */
+	long	l_sysid;
 	__kernel_pid_t l_pid;
-	long  pad[4];			/* ABI junk, unused on Linux */
+	long	pad[4];
 } flock_t;
 
 typedef struct flock64 {