X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Ffcntl.h;h=40b93265d4bae5240896a2c3eaac75fb2577ca76;hb=5f6d858ecca78f71755859a346d845e302973cd1;hp=c52a63755fdd5b69e9bd63353b13e6aa82c738c9;hpb=cf9e50a920be24b734fb91f19b8844f8509cb981;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h
index c52a63755fd..40b93265d4b 100644
--- a/include/linux/fcntl.h
+++ b/include/linux/fcntl.h
@@ -3,6 +3,10 @@
 
 #include <asm/fcntl.h>
 
+/* 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)
+
 #define F_SETLEASE	(F_LINUX_SPECIFIC_BASE+0)
 #define F_GETLEASE	(F_LINUX_SPECIFIC_BASE+1)
 
@@ -29,6 +33,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__