LOCK64 in 2.3.32pre4: Patch to correct some entries

Andreas Jaeger (aj@arthur.rhein-neckar.de)
14 Dec 1999 10:26:30 +0100

Hi Linus,

I've just noticed a small problem with the constants for the new
lock64 stuff as it is in 2.3.32pre4:

For Mips, the numbers are wrong. We now have a duplicate:
#define F_GETLK 14
#define F_SETLKW64 14

And there're no defines and no structure for Sparc32.

I'm appending a patch.

Andreas

--- include/asm-mips/fcntl.h.~1~ Tue Dec 14 10:11:52 1999
+++ include/asm-mips/fcntl.h Tue Dec 14 10:19:22 1999
@@ -46,7 +46,7 @@

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

/* for F_[GET|SET]FL */
#define FD_CLOEXEC 1 /* actually anything with low bit set goes */

--- include/asm-sparc/fcntl.h.~1~ Tue Oct 27 18:52:21 1998
+++ include/asm-sparc/fcntl.h Tue Dec 14 10:25:46 1999
@@ -33,6 +33,10 @@
#define F_SETSIG 10 /* for sockets. */
#define F_GETSIG 11 /* for sockets. */

+#define F_GETLK64 12 /* using 'struct flock64' */
+#define F_SETLK64 13
+#define F_SETLKW64 14
+
/* for F_[GET|SET]FL */
#define FD_CLOEXEC 1 /* actually anything with low bit set goes */

@@ -60,5 +64,13 @@
pid_t l_pid;
short __unused;
};
+
+typedef struct flock64 {
+ short l_type;
+ short l_whence;
+ loff_t l_start;
+ loff_t l_len;
+ pid_t l_pid;
+} flock64_t;

#endif

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/