File enable-clvmd.patch of Package lvm2.import5596

Index: daemons/clvmd/clvm.h
===================================================================
--- daemons/clvmd/clvm.h.orig	2010-04-20 16:07:38.000000000 +0200
+++ daemons/clvmd/clvm.h	2010-09-09 13:50:47.896259810 +0200
@@ -71,3 +71,29 @@ static const char CLVMD_SOCKNAME[] = "\0
 #define CLVMD_CMD_VG_BACKUP	    43
 #define CLVMD_CMD_RESTART	    44
 #endif
+
+
+/* Lock modes: */
+#define LKM_NLMODE      0               /* null lock */
+#define LKM_CRMODE      1               /* concurrent read */
+#define LKM_CWMODE      2               /* concurrent write */
+#define LKM_PRMODE      3               /* protected read */
+#define LKM_PWMODE      4               /* protected write */
+#define LKM_EXMODE      5               /* exclusive */
+/* Locking flags - these match the ones
+ * in dlm.h
+ */
+#define LKF_NOQUEUE        (0x00000001)
+#define LKF_CANCEL         (0x00000002)
+#define LKF_CONVERT        (0x00000004)
+#define LKF_VALBLK         (0x00000008)
+#define LKF_QUECVT         (0x00000010)
+#define LKF_IVVALBLK       (0x00000020)
+#define LKF_CONVDEADLK     (0x00000040)
+#define LKF_PERSISTENT     (0x00000080)
+#define LKF_NODLCKWT       (0x00000100)
+#define LKF_NODLCKBLK      (0x00000200)
+#define LKF_EXPEDITE       (0x00000400)
+#define LKF_NOQUEUEBAST    (0x00000800)
+#define LKF_HEADQUE        (0x00001000)
+#define LKF_NOORDER        (0x00002000)
Index: daemons/clvmd/clvmd-command.c
===================================================================
--- daemons/clvmd/clvmd-command.c.orig	2010-06-04 14:59:30.000000000 +0200
+++ daemons/clvmd/clvmd-command.c	2010-09-09 13:50:02.576262213 +0200
@@ -69,7 +69,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <libdevmapper.h>
-#include <libdlm.h>
+//#include <libdlm.h>
 
 #include "locking.h"
 #include "lvm-logging.h"
Index: daemons/clvmd/clvmd.c
===================================================================
--- daemons/clvmd/clvmd.c.orig	2010-04-20 16:07:38.000000000 +0200
+++ daemons/clvmd/clvmd.c	2010-09-09 13:50:02.577262586 +0200
@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <errno.h>
 #include <limits.h>
+//#include <libdlm.h>
 #ifdef HAVE_COROSYNC_CONFDB_H
 #include <corosync/confdb.h>
 #endif
Index: daemons/clvmd/lvm-functions.c
===================================================================
--- daemons/clvmd/lvm-functions.c.orig	2010-06-04 14:59:30.000000000 +0200
+++ daemons/clvmd/lvm-functions.c	2010-09-09 13:50:02.578261621 +0200
@@ -35,7 +35,7 @@
 #include <syslog.h>
 #include <assert.h>
 #include <libdevmapper.h>
-#include <libdlm.h>
+//#include <libdlm.h>
 
 #include "lvm-types.h"
 #include "clvm.h"