[DLM] cancel in conversion deadlock [4/6]

[linux-2.6-omap-h63xx.git] / include / linux / dlm.h

diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 975f17d8aa53d7d95ece230ce4b06216ded54010..5227a9594f9d47863f5fe31ee28d79cde98a4103 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