From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23453 invoked by alias); 27 Mar 2009 16:34:18 -0000 Received: (qmail 23445 invoked by alias); 27 Mar 2009 16:34:18 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: dlm: master - dlm_controld: skip unlink with no ckpt To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: dlm.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: a8ae02cdcf60b662f6eb941797d0aa8654b9a8b8 X-Git-Newrev: d412e873107000491b0a2c77bb4f6b52b523772c From: David Teigland Message-Id: <20090327163358.73B6B120150@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 16:34:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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: 2009-q1/txt/msg00931.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=d412e873107000491b0a2c77bb4f6b52b523772c Commit: d412e873107000491b0a2c77bb4f6b52b523772c Parent: a8ae02cdcf60b662f6eb941797d0aa8654b9a8b8 Author: David Teigland AuthorDate: Fri Mar 27 11:29:14 2009 -0500 Committer: David Teigland CommitterDate: Fri Mar 27 11:29:53 2009 -0500 dlm_controld: skip unlink with no ckpt Check if there's no previous checkpoint to unlink instead of trying to unlink with a handle of 0, triggering an error message. Signed-off-by: David Teigland --- group/dlm_controld/plock.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c index 885efa3..957d749 100644 --- a/group/dlm_controld/plock.c +++ b/group/dlm_controld/plock.c @@ -1668,6 +1668,9 @@ static int _unlink_checkpoint(struct lockspace *ls, SaNameT *name) h = (SaCkptCheckpointHandleT) ls->plock_ckpt_handle; log_group(ls, "unlink ckpt %llx", (unsigned long long)h); + if (!h) + return; + unlink_retry: rv = saCkptCheckpointUnlink(system_ckpt_handle, name); if (rv == SA_AIS_ERR_TRY_AGAIN) {