update

[l4.git] / l4 / pkg / linux-26-headers / include / asm-generic / fcntl.h

diff --git a/l4/pkg/linux-26-headers/include/asm-generic/fcntl.h b/l4/pkg/linux-26-headers/include/asm-generic/fcntl.h
index a48937d4a5ea5715fafe813baf4f586a0b747355..7543b3e51331fcb38574e3f309713b3a6a2d31c0 100644 (file)
--- a/l4/pkg/linux-26-headers/include/asm-generic/fcntl.h
+++ b/l4/pkg/linux-26-headers/include/asm-generic/fcntl.h
@@ -84,6 +84,14 @@
 #define O_PATH         010000000
 #endif
 
+#ifndef __O_TMPFILE
+#define __O_TMPFILE    020000000
+#endif
+
+/* a horrid kludge trying to make sure that this will fail on old kernels */
+#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
+#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT)      
+
 #ifndef O_NDELAY
 #define O_NDELAY       O_NONBLOCK
 #endif
@@ -124,6 +132,22 @@
 #define F_GETOWNER_UIDS        17
 #endif
 
+/*
+ * Open File Description Locks
+ *
+ * Usually record locks held by a process are released on *any* close and are
+ * not inherited across a fork().
+ *
+ * These cmd values will set locks that conflict with process-associated
+ * record  locks, but are "owned" by the open file description, not the
+ * process. This means that they are inherited across fork() like BSD (flock)
+ * locks, and they are only released automatically when the last reference to
+ * the the open file against which they were acquired is put.
+ */
+#define F_OFD_GETLK    36
+#define F_OFD_SETLK    37
+#define F_OFD_SETLKW   38
+
 #define F_OWNER_TID    0
 #define F_OWNER_PID    1
 #define F_OWNER_PGRP   2
@@ -178,8 +202,6 @@ struct flock {
 };
 #endif
 
-#ifndef CONFIG_64BIT
-
 #ifndef HAVE_ARCH_STRUCT_FLOCK64
 #ifndef __ARCH_FLOCK64_PAD
 #define __ARCH_FLOCK64_PAD
@@ -194,6 +216,5 @@ struct flock64 {
        __ARCH_FLOCK64_PAD
 };
 #endif
-#endif /* !CONFIG_64BIT */
 
 #endif /* _ASM_GENERIC_FCNTL_H */