66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
--- daemons/clvmd/clvmd.c
|
|
+++ daemons/clvmd/clvmd.c
|
|
@@ -37,7 +37,7 @@
|
|
#include <syslog.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
-#include <libdlm.h>
|
|
+//#include <libdlm.h>
|
|
|
|
#include "clvmd-comms.h"
|
|
#include "lvm-functions.h"
|
|
--- daemons/clvmd/clvmd-command.c
|
|
+++ daemons/clvmd/clvmd-command.c
|
|
@@ -65,7 +65,7 @@
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
#include <libdevmapper.h>
|
|
-#include <libdlm.h>
|
|
+//#include <libdlm.h>
|
|
|
|
#include "list.h"
|
|
#include "locking.h"
|
|
--- daemons/clvmd/clvm.h
|
|
+++ daemons/clvmd/clvm.h
|
|
@@ -68,4 +68,29 @@
|
|
#define CLVMD_CMD_GET_CLUSTERNAME 41
|
|
#define CLVMD_CMD_SET_DEBUG 42
|
|
#define CLVMD_CMD_VG_BACKUP 43
|
|
+
|
|
+/* 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)
|
|
#endif
|
|
--- daemons/clvmd/lvm-functions.c
|
|
+++ daemons/clvmd/lvm-functions.c
|
|
@@ -31,7 +31,7 @@
|
|
#include <syslog.h>
|
|
#include <assert.h>
|
|
#include <libdevmapper.h>
|
|
-#include <libdlm.h>
|
|
+//#include <libdlm.h>
|
|
|
|
#include "list.h"
|
|
#include "lvm-types.h"
|