This is the mail archive of the cluster-cvs@sourceware.org mailing list for the cluster.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

cluster: STABLE3 - dlm_controld: skip unlink with no ckpt


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c1e139fb328408891d054e577b33d724230dde43
Commit:        c1e139fb328408891d054e577b33d724230dde43
Parent:        c95cf4b05ba0c7b81559f06a5ee825389d8c70ce
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Fri Mar 27 11:26:07 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Fri Mar 27 11:28:25 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 <teigland@redhat.com>
---
 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 2acfe62..680695e 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -1669,6 +1669,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) {


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]