diff options
author | David Teigland <teigland@redhat.com> | 2006-07-12 17:44:04 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-13 09:25:34 -0400 |
commit | 597d0cae0f99f62501e229bed50e8149604015bb (patch) | |
tree | b6cab09ff6fe2246740848164c0a52d5c03136a0 /fs/dlm/lock.h | |
parent | 2eb168ca94aba3bcae350ad9b31870955174a218 (diff) |
[DLM] dlm: user locks
This changes the way the dlm handles user locks. The core dlm is now
aware of user locks so they can be dealt with more efficiently. There is
no more dlm_device module which previously managed its own duplicate copy
of every user lock.
Signed-off-by: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm/lock.h')
-rw-r--r-- | fs/dlm/lock.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h index 56cdc073b1f6..8d2660f0ab10 100644 --- a/fs/dlm/lock.h +++ b/fs/dlm/lock.h | |||
@@ -14,6 +14,7 @@ | |||
14 | #define __LOCK_DOT_H__ | 14 | #define __LOCK_DOT_H__ |
15 | 15 | ||
16 | void dlm_print_rsb(struct dlm_rsb *r); | 16 | void dlm_print_rsb(struct dlm_rsb *r); |
17 | void dlm_print_lkb(struct dlm_lkb *lkb); | ||
17 | int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery); | 18 | int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery); |
18 | int dlm_modes_compat(int mode1, int mode2); | 19 | int dlm_modes_compat(int mode1, int mode2); |
19 | int dlm_find_rsb(struct dlm_ls *ls, char *name, int namelen, | 20 | int dlm_find_rsb(struct dlm_ls *ls, char *name, int namelen, |
@@ -31,6 +32,16 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls); | |||
31 | int dlm_recover_master_copy(struct dlm_ls *ls, struct dlm_rcom *rc); | 32 | int dlm_recover_master_copy(struct dlm_ls *ls, struct dlm_rcom *rc); |
32 | int dlm_recover_process_copy(struct dlm_ls *ls, struct dlm_rcom *rc); | 33 | int dlm_recover_process_copy(struct dlm_ls *ls, struct dlm_rcom *rc); |
33 | 34 | ||
35 | int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua, int mode, | ||
36 | uint32_t flags, void *name, unsigned int namelen, uint32_t parent_lkid); | ||
37 | int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, | ||
38 | int mode, uint32_t flags, uint32_t lkid, char *lvb_in); | ||
39 | int dlm_user_unlock(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, | ||
40 | uint32_t flags, uint32_t lkid, char *lvb_in); | ||
41 | int dlm_user_cancel(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, | ||
42 | uint32_t flags, uint32_t lkid); | ||
43 | void dlm_clear_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc); | ||
44 | |||
34 | static inline int is_master(struct dlm_rsb *r) | 45 | static inline int is_master(struct dlm_rsb *r) |
35 | { | 46 | { |
36 | return !r->res_nodeid; | 47 | return !r->res_nodeid; |