Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[sfrench/cifs-2.6.git] / include / linux / fcntl.h

diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h
index c52a63755fdd5b69e9bd63353b13e6aa82c738c9..86037400a6e380f8ec5b1bd31acc6ebfbb296bd1 100644 (file)
--- a/include/linux/fcntl.h
+++ b/include/linux/fcntl.h
@@ -3,8 +3,17 @@
 
 #include <asm/fcntl.h>
 
-#define F_SETLEASE     (F_LINUX_SPECIFIC_BASE+0)
-#define F_GETLEASE     (F_LINUX_SPECIFIC_BASE+1)
+#define F_SETLEASE     (F_LINUX_SPECIFIC_BASE + 0)
+#define F_GETLEASE     (F_LINUX_SPECIFIC_BASE + 1)
+
+/*
+ * Cancel a blocking posix lock; internal use only until we expose an
+ * asynchronous lock api to userspace:
+ */
+#define F_CANCELLK     (F_LINUX_SPECIFIC_BASE + 5)
+
+/* Create a file descriptor with FD_CLOEXEC set. */
+#define F_DUPFD_CLOEXEC        (F_LINUX_SPECIFIC_BASE + 6)
 
 /*
  * Request nofications on a directory.
@@ -29,6 +38,7 @@
 #define AT_SYMLINK_NOFOLLOW    0x100   /* Do not follow symbolic links.  */
 #define AT_REMOVEDIR           0x200   /* Remove directory instead of
                                            unlinking file.  */
+#define AT_SYMLINK_FOLLOW      0x400   /* Follow symbolic links.  */
 
 #ifdef __KERNEL__