V3 file capabilities: alter behavior of cap_setpcap

[safe/jmp/linux-2.6] / include / linux / dlm.h

diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 975f17d..be9d278 100644 (file)
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -85,7 +85,11 @@
  * Only relevant to locks originating in userspace.  A persistent lock will not
  * be removed if the process holding the lock exits.
  *
- * DLM_LKF_NODLKWT
+ * DLM_LKF_NODLCKWT
+ *
+ * Do not cancel the lock if it gets into conversion deadlock.
+ * Exclude this lock from being monitored due to DLM_LSFL_TIMEWARN.
+ *
  * DLM_LKF_NODLCKBLK
  *
  * net yet implemented
@@ -202,6 +206,7 @@ struct dlm_lksb {
 
 #define DLM_LSFL_NODIR         0x00000001
 #define DLM_LSFL_TIMEWARN      0x00000002
+#define DLM_LSFL_FS            0x00000004
 
 #ifdef __KERNEL__