1 files changed, 2 insertions, 138 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index be9d278761e0..c743fbc769db 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -19,148 +19,12 @@
 * routines and structures to use DLM lockspaces
 */
-/*
+/* Lock levels and flags are here */
- * Lock Modes
+#include <linux/dlmconstants.h>
- */
-#define DLM_LOCK_IV             -1      /* invalid */
-#define DLM_LOCK_NL             0       /* null */
-#define DLM_LOCK_CR             1       /* concurrent read */
-#define DLM_LOCK_CW             2       /* concurrent write */
-#define DLM_LOCK_PR             3       /* protected read */
-#define DLM_LOCK_PW             4       /* protected write */
-#define DLM_LOCK_EX             5       /* exclusive */
-/*
- * Maximum size in bytes of a dlm_lock name
- */
 #define DLM_RESNAME_MAXLEN      64
-/*
- * Flags to dlm_lock
- *
- * DLM_LKF_NOQUEUE
- *
- * Do not queue the lock request on the wait queue if it cannot be granted
- * immediately.  If the lock cannot be granted because of this flag, DLM will
- * either return -EAGAIN from the dlm_lock call or will return 0 from
- * dlm_lock and -EAGAIN in the lock status block when the AST is executed.
- *
- * DLM_LKF_CANCEL
- *
- * Used to cancel a pending lock request or conversion.  A converting lock is
- * returned to its previously granted mode.
- *
- * DLM_LKF_CONVERT
- *
- * Indicates a lock conversion request.  For conversions the name and namelen
- * are ignored and the lock ID in the LKSB is used to identify the lock.
- *
- * DLM_LKF_VALBLK
- *
- * Requests DLM to return the current contents of the lock value block in the
- * lock status block.  When this flag is set in a lock conversion from PW or EX
- * modes, DLM assigns the value specified in the lock status block to the lock
- * value block of the lock resource.  The LVB is a DLM_LVB_LEN size array
- * containing application-specific information.
- *
- * DLM_LKF_QUECVT
- *
- * Force a conversion request to be queued, even if it is compatible with
- * the granted modes of other locks on the same resource.
- *
- * DLM_LKF_IVVALBLK
- *
- * Invalidate the lock value block.
- *
- * DLM_LKF_CONVDEADLK
- *
- * Allows the dlm to resolve conversion deadlocks internally by demoting the
- * granted mode of a converting lock to NL.  The DLM_SBF_DEMOTED flag is
- * returned for a conversion that's been effected by this.
- *
- * DLM_LKF_PERSISTENT
- *
- * Only relevant to locks originating in userspace.  A persistent lock will not
- * be removed if the process holding the lock exits.
- *
- * 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
- *
- * DLM_LKF_EXPEDITE
- *
- * Used only with new requests for NL mode locks.  Tells the lock manager
- * to grant the lock, ignoring other locks in convert and wait queues.
- *
- * DLM_LKF_NOQUEUEBAST
- *
- * Send blocking AST's before returning -EAGAIN to the caller.  It is only
- * used along with the NOQUEUE flag.  Blocking AST's are not sent for failed
- * NOQUEUE requests otherwise.
- *
- * DLM_LKF_HEADQUE
- *
- * Add a lock to the head of the convert or wait queue rather than the tail.
- *
- * DLM_LKF_NOORDER
- *
- * Disregard the standard grant order rules and grant a lock as soon as it
- * is compatible with other granted locks.
- *
- * DLM_LKF_ORPHAN
- *
- * not yet implemented
- *
- * DLM_LKF_ALTPR
- *
- * If the requested mode cannot be granted immediately, try to grant the lock
- * in PR mode instead.  If this alternate mode is granted instead of the
- * requested mode, DLM_SBF_ALTMODE is returned in the lksb.
- *
- * DLM_LKF_ALTCW
- *
- * The same as ALTPR, but the alternate mode is CW.
- *
- * DLM_LKF_FORCEUNLOCK
- *
- * Unlock the lock even if it is converting or waiting or has sublocks.
- * Only really for use by the userland device.c code.
- *
- */
-#define DLM_LKF_NOQUEUE         0x00000001
-#define DLM_LKF_CANCEL          0x00000002
-#define DLM_LKF_CONVERT         0x00000004
-#define DLM_LKF_VALBLK          0x00000008
-#define DLM_LKF_QUECVT          0x00000010
-#define DLM_LKF_IVVALBLK        0x00000020
-#define DLM_LKF_CONVDEADLK      0x00000040
-#define DLM_LKF_PERSISTENT      0x00000080
-#define DLM_LKF_NODLCKWT        0x00000100
-#define DLM_LKF_NODLCKBLK       0x00000200
-#define DLM_LKF_EXPEDITE        0x00000400
-#define DLM_LKF_NOQUEUEBAST     0x00000800
-#define DLM_LKF_HEADQUE         0x00001000
-#define DLM_LKF_NOORDER         0x00002000
-#define DLM_LKF_ORPHAN          0x00004000
-#define DLM_LKF_ALTPR           0x00008000
-#define DLM_LKF_ALTCW           0x00010000
-#define DLM_LKF_FORCEUNLOCK     0x00020000
-#define DLM_LKF_TIMEOUT         0x00040000
-/*
- * Some return codes that are not in errno.h
- */
-#define DLM_ECANCEL             0x10001
-#define DLM_EUNLOCK             0x10002
 typedef void dlm_lockspace_t;

diff --git a/include/linux/dlm.h b/include/linux/dlm.h index be9d278761e0..c743fbc769db 100644 --- a/include/linux/dlm.h +++ b/include/linux/dlm.h
@@ -19,148 +19,12 @@
19	* routines and structures to use DLM lockspaces	19	* routines and structures to use DLM lockspaces
20	*/	20	*/
21		21
22	/*	22	/* Lock levels and flags are here */
23	* Lock Modes	23	#include <linux/dlmconstants.h>
24	*/
25		24
26	#define DLM_LOCK_IV -1 /* invalid */
27	#define DLM_LOCK_NL 0 /* null */
28	#define DLM_LOCK_CR 1 /* concurrent read */
29	#define DLM_LOCK_CW 2 /* concurrent write */
30	#define DLM_LOCK_PR 3 /* protected read */
31	#define DLM_LOCK_PW 4 /* protected write */
32	#define DLM_LOCK_EX 5 /* exclusive */
33
34	/*
35	* Maximum size in bytes of a dlm_lock name
36	*/
37		25
38	#define DLM_RESNAME_MAXLEN 64	26	#define DLM_RESNAME_MAXLEN 64
39		27
40	/*
41	* Flags to dlm_lock
42	*
43	* DLM_LKF_NOQUEUE
44	*
45	* Do not queue the lock request on the wait queue if it cannot be granted
46	* immediately. If the lock cannot be granted because of this flag, DLM will
47	* either return -EAGAIN from the dlm_lock call or will return 0 from
48	* dlm_lock and -EAGAIN in the lock status block when the AST is executed.
49	*
50	* DLM_LKF_CANCEL
51	*
52	* Used to cancel a pending lock request or conversion. A converting lock is
53	* returned to its previously granted mode.
54	*
55	* DLM_LKF_CONVERT
56	*
57	* Indicates a lock conversion request. For conversions the name and namelen
58	* are ignored and the lock ID in the LKSB is used to identify the lock.
59	*
60	* DLM_LKF_VALBLK
61	*
62	* Requests DLM to return the current contents of the lock value block in the
63	* lock status block. When this flag is set in a lock conversion from PW or EX
64	* modes, DLM assigns the value specified in the lock status block to the lock
65	* value block of the lock resource. The LVB is a DLM_LVB_LEN size array
66	* containing application-specific information.
67	*
68	* DLM_LKF_QUECVT
69	*
70	* Force a conversion request to be queued, even if it is compatible with
71	* the granted modes of other locks on the same resource.
72	*
73	* DLM_LKF_IVVALBLK
74	*
75	* Invalidate the lock value block.
76	*
77	* DLM_LKF_CONVDEADLK
78	*
79	* Allows the dlm to resolve conversion deadlocks internally by demoting the
80	* granted mode of a converting lock to NL. The DLM_SBF_DEMOTED flag is
81	* returned for a conversion that's been effected by this.
82	*
83	* DLM_LKF_PERSISTENT
84	*
85	* Only relevant to locks originating in userspace. A persistent lock will not
86	* be removed if the process holding the lock exits.
87	*
88	* DLM_LKF_NODLCKWT
89	*
90	* Do not cancel the lock if it gets into conversion deadlock.
91	* Exclude this lock from being monitored due to DLM_LSFL_TIMEWARN.
92	*
93	* DLM_LKF_NODLCKBLK
94	*
95	* net yet implemented
96	*
97	* DLM_LKF_EXPEDITE
98	*
99	* Used only with new requests for NL mode locks. Tells the lock manager
100	* to grant the lock, ignoring other locks in convert and wait queues.
101	*
102	* DLM_LKF_NOQUEUEBAST
103	*
104	* Send blocking AST's before returning -EAGAIN to the caller. It is only
105	* used along with the NOQUEUE flag. Blocking AST's are not sent for failed
106	* NOQUEUE requests otherwise.
107	*
108	* DLM_LKF_HEADQUE
109	*
110	* Add a lock to the head of the convert or wait queue rather than the tail.
111	*
112	* DLM_LKF_NOORDER
113	*
114	* Disregard the standard grant order rules and grant a lock as soon as it
115	* is compatible with other granted locks.
116	*
117	* DLM_LKF_ORPHAN
118	*
119	* not yet implemented
120	*
121	* DLM_LKF_ALTPR
122	*
123	* If the requested mode cannot be granted immediately, try to grant the lock
124	* in PR mode instead. If this alternate mode is granted instead of the
125	* requested mode, DLM_SBF_ALTMODE is returned in the lksb.
126	*
127	* DLM_LKF_ALTCW
128	*
129	* The same as ALTPR, but the alternate mode is CW.
130	*
131	* DLM_LKF_FORCEUNLOCK
132	*
133	* Unlock the lock even if it is converting or waiting or has sublocks.
134	* Only really for use by the userland device.c code.
135	*
136	*/
137
138	#define DLM_LKF_NOQUEUE 0x00000001
139	#define DLM_LKF_CANCEL 0x00000002
140	#define DLM_LKF_CONVERT 0x00000004
141	#define DLM_LKF_VALBLK 0x00000008
142	#define DLM_LKF_QUECVT 0x00000010
143	#define DLM_LKF_IVVALBLK 0x00000020
144	#define DLM_LKF_CONVDEADLK 0x00000040
145	#define DLM_LKF_PERSISTENT 0x00000080
146	#define DLM_LKF_NODLCKWT 0x00000100
147	#define DLM_LKF_NODLCKBLK 0x00000200
148	#define DLM_LKF_EXPEDITE 0x00000400
149	#define DLM_LKF_NOQUEUEBAST 0x00000800
150	#define DLM_LKF_HEADQUE 0x00001000
151	#define DLM_LKF_NOORDER 0x00002000
152	#define DLM_LKF_ORPHAN 0x00004000
153	#define DLM_LKF_ALTPR 0x00008000
154	#define DLM_LKF_ALTCW 0x00010000
155	#define DLM_LKF_FORCEUNLOCK 0x00020000
156	#define DLM_LKF_TIMEOUT 0x00040000
157
158	/*
159	* Some return codes that are not in errno.h
160	*/
161
162	#define DLM_ECANCEL 0x10001
163	#define DLM_EUNLOCK 0x10002
164		28
165	typedef void dlm_lockspace_t;	29	typedef void dlm_lockspace_t;
166		30