From mboxrd@z Thu Jan 1 00:00:00 1970 From: teigland@sourceware.org Date: 14 Aug 2007 17:14:56 -0000 Subject: [Cluster-devel] cluster/dlm-kernel/src locking.c Message-ID: <20070814171456.31759.qmail@sourceware.org> List-Id: 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: RHEL4 Changes by: teigland at sourceware.org 2007-08-14 17:14:55 Modified files: dlm-kernel/src : locking.c Log message: Just ignore user lock that's not in convert state during conversion deadlock check instead of asserting. (This is code that's never touched by our own software, but someone's custom app hit it.) bz 240453: DLM locking assertion failure line 1390 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/locking.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.50.2.10&r2=1.50.2.11 --- cluster/dlm-kernel/src/Attic/locking.c 2007/01/03 16:10:27 1.50.2.10 +++ cluster/dlm-kernel/src/Attic/locking.c 2007/08/14 17:14:55 1.50.2.11 @@ -1432,7 +1432,8 @@ struct dlm_rsb *rsb = lkb->lkb_resource; struct list_head *entry; - DLM_ASSERT(lkb->lkb_status == GDLM_LKSTS_CONVERT,); + if (lkb->lkb_status != GDLM_LKSTS_CONVERT) + return NULL; /* Work our way up to the head of the queue looking for locks that * conflict with us */