From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 14 Aug 2006 21:13:27 -0000
Subject: [Cluster-devel] cluster/dlm-kernel/src device.c
Message-ID: <20060814211327.29383.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	teigland at sourceware.org	2006-08-14 21:13:26

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

Log message:
	fix bz 201325 - Kernel Oops when passing LKF_CANCEL to dlm_ls_unlock_wait
	from Carsten Clasohm (clasohm at redhat.com)
	CVn: 	device.c

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/device.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.24.2.1.4.1.2.8&r2=1.24.2.1.4.1.2.9

--- cluster/dlm-kernel/src/Attic/device.c	2006/04/12 09:25:00	1.24.2.1.4.1.2.8
+++ cluster/dlm-kernel/src/Attic/device.c	2006/08/14 21:13:26	1.24.2.1.4.1.2.9
@@ -344,7 +344,7 @@
 
 			/* If the LKB has been freed then we need to tidy up too */
 			lkb = dlm_get_lkb(li->li_file->fi_ls->ls_lockspace, li->li_lksb.sb_lkid);
-			if (!lkb) {
+			if (!lkb && test_bit(LI_FLAG_ONLIST, &li->li_flags)) {
 				spin_lock(&li->li_file->fi_lkb_lock);
 				list_del(&li->li_ownerqueue);
 				clear_bit(LI_FLAG_ONLIST, &li->li_flags);