Hi Linus,
This part was missing from the leases & directory notification
patch that was applied to 2.4.0-test9pre5. Please apply.
Cheers,
Stephen
--
Stephen Rothwell, Open Source Researcher, Linuxcare, Inc.
+61-2-62628990 tel, +61-2-62628991 fax
[EMAIL PROTECTED], http://www.linuxcare.com/
Linuxcare. Support for the revolution.
diff -ruN 2.4.0-test9pre7/include/asm-alpha/fcntl.h
2.4.0-test9pre7-UFL/include/asm-alpha/fcntl.h
--- 2.4.0-test9pre7/include/asm-alpha/fcntl.h Thu Aug 24 17:52:14 2000
+++ 2.4.0-test9pre7-UFL/include/asm-alpha/fcntl.h Wed Sep 27 02:30:11 2000
@@ -48,6 +48,9 @@
#define F_EXLCK 16 /* or 3 */
#define F_SHLCK 32 /* or 4 */
+/* for leases */
+#define F_INPROGRESS 64
+
/* operations for bsd flock(), also used by the kernel implementation */
#define LOCK_SH 1 /* shared lock */
#define LOCK_EX 2 /* exclusive lock */
@@ -55,6 +58,10 @@
blocking */
#define LOCK_UN 8 /* remove lock */
+#define LOCK_MAND 32 /* This is a mandatory flock */
+#define LOCK_READ 64 /* ... Which allows concurrent read operations */
+#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */
+
struct flock {
short l_type;
short l_whence;
@@ -66,5 +73,7 @@
#ifdef __KERNEL__
#define flock64 flock
#endif
+
+#define F_LINUX_SPECIFIC_BASE 1024
#endif
diff -ruN 2.4.0-test9pre7/include/asm-alpha/resource.h
2.4.0-test9pre7-UFL/include/asm-alpha/resource.h
--- 2.4.0-test9pre7/include/asm-alpha/resource.h Fri Feb 18 04:35:07 2000
+++ 2.4.0-test9pre7-UFL/include/asm-alpha/resource.h Wed Sep 27 02:33:04 2000
@@ -15,8 +15,9 @@
#define RLIMIT_AS 7 /* address space limit(?) */
#define RLIMIT_NPROC 8 /* max number of processes */
#define RLIMIT_MEMLOCK 9 /* max locked-in-memory address space */
+#define RLIMIT_LOCKS 10 /* maximum file locks held */
-#define RLIM_NLIMITS 10
+#define RLIM_NLIMITS 11
/*
* SuS says limits have to be unsigned. Fine, it's unsigned, but
@@ -39,6 +40,7 @@
{LONG_MAX, LONG_MAX}, /* RLIMIT_AS */ \
{LONG_MAX, LONG_MAX}, /* RLIMIT_NPROC */ \
{LONG_MAX, LONG_MAX}, /* RLIMIT_MEMLOCK */ \
+ {LONG_MAX, LONG_MAX}, /* RLIMIT_LOCKS */ \
}
#endif /* __KERNEL__ */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
