Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / fcntl.h

diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h
index 996f5611cd59dc73ed9d01b2dec84f0708dcf7d9..40b93265d4bae5240896a2c3eaac75fb2577ca76 100644 (file)
--- 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)