From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3548 invoked by alias); 16 Apr 2008 19:24:32 -0000 Received: (qmail 3517 invoked by uid 9494); 16 Apr 2008 19:24:31 -0000 Date: Wed, 16 Apr 2008 19:24:00 -0000 Message-ID: <20080416192431.3504.qmail@sourceware.org> From: cfeist@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL46, updated. cman-kernel_2_6_9_54-9-g98e82d8 X-Git-Refname: refs/heads/RHEL46 X-Git-Reftype: branch X-Git-Oldrev: 1c9932d3cc533daedac7cfb3a50b7d6ff8d07990 X-Git-Newrev: 98e82d8e38259f37db87044d1a2446391583d0cf Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00127.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=98e82d8e38259f37db87044d1a2446391583d0cf The branch, RHEL46 has been updated via 98e82d8e38259f37db87044d1a2446391583d0cf (commit) from 1c9932d3cc533daedac7cfb3a50b7d6ff8d07990 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 98e82d8e38259f37db87044d1a2446391583d0cf Author: David Teigland Date: Fri Jan 4 16:12:05 2008 +0000 Some message gets out of place, but there's no need to panic the machine; just ignore it. bz 427531 4.6.z bz#441758 ----------------------------------------------------------------------- Summary of changes: dlm-kernel/src/lockqueue.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlm-kernel/src/lockqueue.c b/dlm-kernel/src/lockqueue.c index 595bc53..70313e9 100644 --- a/dlm-kernel/src/lockqueue.c +++ b/dlm-kernel/src/lockqueue.c @@ -243,8 +243,13 @@ void purge_requestqueue(struct dlm_ls *ls) */ 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++; hooks/post-receive -- Cluster Project