diff options
| author | David Teigland <teigland@redhat.com> | 2007-05-18 09:00:32 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-07-09 08:22:36 +0100 |
| commit | d7db923ea4990edb5583bf54af868ba687a1bc84 (patch) | |
| tree | 3efa0db00a3a6400f43a65aef2726fa813f9dfa2 /fs/dlm/lock.h | |
| parent | 3ae1acf93a21512512f8a78430fcde5992dd208e (diff) | |
| download | linux-3.10-d7db923ea4990edb5583bf54af868ba687a1bc84.tar.gz linux-3.10-d7db923ea4990edb5583bf54af868ba687a1bc84.tar.bz2 linux-3.10-d7db923ea4990edb5583bf54af868ba687a1bc84.zip | |
[DLM] dlm_device interface changes [3/6]
Change the user/kernel device interface used by libdlm:
- Add ability for userspace to check the version of the interface. libdlm
can now adapt to different versions of the kernel interface.
- Increase the size of the flags passed in a lock request so all possible
flags can be used from userspace.
- Add an opaque "xid" value for each lock. This "transaction id" will be
used later to associate locks with each other during deadlock detection.
- Add a "timeout" value for each lock. This is used along with the
DLM_LKF_TIMEOUT flag.
Also, remove a fragment of unused code in device_read().
This patch requires updating libdlm which is backward compatible with
older kernels.
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h index 6b5b71f0e9d..99ab4635074 100644 --- a/fs/dlm/lock.h +++ b/fs/dlm/lock.h @@ -38,9 +38,11 @@ int dlm_recover_master_copy(struct dlm_ls *ls, struct dlm_rcom *rc); int dlm_recover_process_copy(struct dlm_ls *ls, struct dlm_rcom *rc); int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua, int mode, - uint32_t flags, void *name, unsigned int namelen, uint32_t parent_lkid); + uint32_t flags, void *name, unsigned int namelen, + unsigned long timeout_cs); int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, - int mode, uint32_t flags, uint32_t lkid, char *lvb_in); + int mode, uint32_t flags, uint32_t lkid, char *lvb_in, + unsigned long timeout_cs); int dlm_user_unlock(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, uint32_t flags, uint32_t lkid, char *lvb_in); int dlm_user_cancel(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, |