aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm/lock.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-01-07 16:55:18 -0500
committerDavid Teigland <teigland@redhat.com>2008-01-30 12:04:42 -0500
commit8a358ca8e738b6226b004efea462ac28c0a2bbb1 (patch)
treeb604770315d797d907f8aff4bd7c17f26ccf3ae4 /fs/dlm/lock.c
parent861e2369e9e7e003677f99f22c4d1f05d3ed66d3 (diff)
dlm: clear ast_type when removing from astqueue
The lkb_ast_type field indicates whether the lkb is on the astqueue list. When clearing locks for a process, lkb's were being removed from the astqueue list without clearing the field. If release_lockspace then happened immediately afterward, it could try to remove the lkb from the list a second time. Appears when process calls libdlm dlm_release_lockspace() which first closes the ls dev triggering clear_proc_locks, and then removes the ls (a write to control dev) causing release_lockspace(). Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/lock.c')
-rw-r--r--fs/dlm/lock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index ddb46281f34d..43ca2a30c413 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -4678,6 +4678,7 @@ void dlm_clear_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc)
4678 } 4678 }
4679 4679
4680 list_for_each_entry_safe(lkb, safe, &proc->asts, lkb_astqueue) { 4680 list_for_each_entry_safe(lkb, safe, &proc->asts, lkb_astqueue) {
4681 lkb->lkb_ast_type = 0;
4681 list_del(&lkb->lkb_astqueue); 4682 list_del(&lkb->lkb_astqueue);
4682 dlm_put_lkb(lkb); 4683 dlm_put_lkb(lkb);
4683 } 4684 }