[Cluster-devel] cluster/dlm-kernel/src lockqueue.c

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	teigland at sourceware.org	2008-01-04 16:12:05

Modified files:
	dlm-kernel/src : lockqueue.c 

Log message:
	Some message gets out of place, but there's no need to panic
	the machine; just ignore it.  bz 427531

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lockqueue.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.37.2.10&r2=1.37.2.11

--- cluster/dlm-kernel/src/Attic/lockqueue.c	2007/11/07 15:22:31	1.37.2.10
+++ cluster/dlm-kernel/src/Attic/lockqueue.c	2008/01/04 16:12:05	1.37.2.11
@@ -243,8 +243,13 @@
 			 */
 
 			lkb = find_lock_by_id(ls, hd->rh_lkid);
-			DLM_ASSERT(lkb,);
-			if (lkb->lkb_lockqueue_state == GDLM_LQSTATE_WAIT_RSB) {
+			if (!lkb) {
+				log_error(ls, "purge %x from %d no lkb",
+					  hd->rh_lkid, entry->rqe_nodeid);
+				list_del(&entry->rqe_list);
+				kfree(entry);
+				count++;
+			} else if (lkb->lkb_lockqueue_state == GDLM_LQSTATE_WAIT_RSB) {
 				list_del(&entry->rqe_list);
 				kfree(entry);
 				count++;