X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fdlm.h;h=be9d278761e0ed5ddbb87653d64f34e9108956cb;hb=7616ee95f27a04fd5a6434e9ef4a82cec4b2807c;hp=975f17d8aa53d7d95ece230ce4b06216ded54010;hpb=3ae1acf93a21512512f8a78430fcde5992dd208e;p=linux-2.6

diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 975f17d8aa..be9d278761 100644
--- 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__