From: David Teigland <teigland@redhat.com>
Date: Mon, 7 Jan 2008 21:55:18 +0000 (-0600)
Subject: dlm: clear ast_type when removing from astqueue
X-Git-Tag: v2.6.25-rc1~1139^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8a358ca8e738b6226b004efea462ac28c0a2bbb1;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index ddb46281f34..43ca2a30c41 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)
 	}
 
 	list_for_each_entry_safe(lkb, safe, &proc->asts, lkb_astqueue) {
+		lkb->lkb_ast_type = 0;
 		list_del(&lkb->lkb_astqueue);
 		dlm_put_lkb(lkb);
 	}