diff options
author | David Teigland <teigland@redhat.com> | 2006-02-23 04:56:38 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-23 04:56:38 -0500 |
commit | 3bcd3687f895f178fa8480a7bcc47a363817354a (patch) | |
tree | 13e64d5b9576b47401620aaada846f3c9c874cda /fs/dlm/dlm_internal.h | |
parent | d35462b4bb847b68321c55e95c926aa485aecce2 (diff) |
[DLM] Remove range locks from the DLM
This patch removes support for range locking from the DLM
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm/dlm_internal.h')
-rw-r--r-- | fs/dlm/dlm_internal.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index 16f20cfd919..c3299020c8f 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h | |||
@@ -146,7 +146,6 @@ struct dlm_args { | |||
146 | void *bastaddr; | 146 | void *bastaddr; |
147 | int mode; | 147 | int mode; |
148 | struct dlm_lksb *lksb; | 148 | struct dlm_lksb *lksb; |
149 | struct dlm_range *range; | ||
150 | }; | 149 | }; |
151 | 150 | ||
152 | 151 | ||
@@ -195,13 +194,6 @@ struct dlm_args { | |||
195 | #define AST_COMP 1 | 194 | #define AST_COMP 1 |
196 | #define AST_BAST 2 | 195 | #define AST_BAST 2 |
197 | 196 | ||
198 | /* lkb_range[] */ | ||
199 | |||
200 | #define GR_RANGE_START 0 | ||
201 | #define GR_RANGE_END 1 | ||
202 | #define RQ_RANGE_START 2 | ||
203 | #define RQ_RANGE_END 3 | ||
204 | |||
205 | /* lkb_status */ | 197 | /* lkb_status */ |
206 | 198 | ||
207 | #define DLM_LKSTS_WAITING 1 | 199 | #define DLM_LKSTS_WAITING 1 |
@@ -212,7 +204,6 @@ struct dlm_args { | |||
212 | 204 | ||
213 | #define DLM_IFL_MSTCPY 0x00010000 | 205 | #define DLM_IFL_MSTCPY 0x00010000 |
214 | #define DLM_IFL_RESEND 0x00020000 | 206 | #define DLM_IFL_RESEND 0x00020000 |
215 | #define DLM_IFL_RANGE 0x00000001 | ||
216 | 207 | ||
217 | struct dlm_lkb { | 208 | struct dlm_lkb { |
218 | struct dlm_rsb *lkb_resource; /* the rsb */ | 209 | struct dlm_rsb *lkb_resource; /* the rsb */ |
@@ -241,7 +232,6 @@ struct dlm_lkb { | |||
241 | struct list_head lkb_wait_reply; /* waiting for remote reply */ | 232 | struct list_head lkb_wait_reply; /* waiting for remote reply */ |
242 | struct list_head lkb_astqueue; /* need ast to be sent */ | 233 | struct list_head lkb_astqueue; /* need ast to be sent */ |
243 | 234 | ||
244 | uint64_t *lkb_range; /* array of gr/rq ranges */ | ||
245 | char *lkb_lvbptr; | 235 | char *lkb_lvbptr; |
246 | struct dlm_lksb *lkb_lksb; /* caller's status block */ | 236 | struct dlm_lksb *lkb_lksb; /* caller's status block */ |
247 | void *lkb_astaddr; /* caller's ast function */ | 237 | void *lkb_astaddr; /* caller's ast function */ |
@@ -360,7 +350,6 @@ struct dlm_message { | |||
360 | int m_bastmode; | 350 | int m_bastmode; |
361 | int m_asts; | 351 | int m_asts; |
362 | int m_result; /* 0 or -EXXX */ | 352 | int m_result; /* 0 or -EXXX */ |
363 | uint64_t m_range[2]; | ||
364 | char m_extra[0]; /* name or lvb */ | 353 | char m_extra[0]; /* name or lvb */ |
365 | }; | 354 | }; |
366 | 355 | ||
@@ -413,7 +402,6 @@ struct rcom_lock { | |||
413 | int8_t rl_asts; | 402 | int8_t rl_asts; |
414 | uint16_t rl_wait_type; | 403 | uint16_t rl_wait_type; |
415 | uint16_t rl_namelen; | 404 | uint16_t rl_namelen; |
416 | uint64_t rl_range[4]; | ||
417 | char rl_name[DLM_RESNAME_MAXLEN]; | 405 | char rl_name[DLM_RESNAME_MAXLEN]; |
418 | char rl_lvb[0]; | 406 | char rl_lvb[0]; |
419 | }; | 407 | }; |