diff options
| author | David Teigland <teigland@redhat.com> | 2007-05-29 08:44:23 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-07-09 08:22:52 +0100 |
| commit | 84d8cd69a8e7f1c9962f46bc79850c9f1f663806 (patch) | |
| tree | 4c0cedc62e7b94ba2aaa1ea9faeb7de074e08e08 /fs/dlm/netlink.c | |
| parent | b3cab7b9a34a6e65c1ca8f80fb57b256d57e8555 (diff) | |
| download | linux-stable-84d8cd69a8e7f1c9962f46bc79850c9f1f663806.tar.gz linux-stable-84d8cd69a8e7f1c9962f46bc79850c9f1f663806.tar.bz2 linux-stable-84d8cd69a8e7f1c9962f46bc79850c9f1f663806.zip | |
[DLM] timeout fixes
Various fixes related to the new timeout feature:
- add_timeout() missed setting TIMEWARN flag on lkb's when the
TIMEOUT flag was already set
- clear_proc_locks should remove a dead process's locks from the
timeout list
- the end-of-life calculation for user locks needs to consider that
ETIMEDOUT is equivalent to -DLM_ECANCEL
- make initial default timewarn_cs config value visible in configfs
- change bit position of TIMEOUT_CANCEL flag so it's not copied to
a remote master node
- set timestamp on remote lkb's so a lock dump will display the time
they've been waiting
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm/netlink.c')
| -rw-r--r-- | fs/dlm/netlink.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c index 804b32cd22c1..863b87d0dc71 100644 --- a/fs/dlm/netlink.c +++ b/fs/dlm/netlink.c @@ -133,8 +133,6 @@ void dlm_timeout_warn(struct dlm_lkb *lkb) size_t size; int rv; - log_debug(lkb->lkb_resource->res_ls, "timeout_warn %x", lkb->lkb_id); - size = nla_total_size(sizeof(struct dlm_lock_data)) + nla_total_size(0); /* why this? */ |