aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm/netlink.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2007-05-29 09:44:23 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2007-07-09 03:22:52 -0400
commit84d8cd69a8e7f1c9962f46bc79850c9f1f663806 (patch)
tree4c0cedc62e7b94ba2aaa1ea9faeb7de074e08e08 /fs/dlm/netlink.c
parentb3cab7b9a34a6e65c1ca8f80fb57b256d57e8555 (diff)
[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.c2
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)
133 size_t size; 133 size_t size;
134 int rv; 134 int rv;
135 135
136 log_debug(lkb->lkb_resource->res_ls, "timeout_warn %x", lkb->lkb_id);
137
138 size = nla_total_size(sizeof(struct dlm_lock_data)) + 136 size = nla_total_size(sizeof(struct dlm_lock_data)) +
139 nla_total_size(0); /* why this? */ 137 nla_total_size(0); /* why this? */
140 138