Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 41a8154dbe97608a45bcd80666b7b5f74527a5f9
Parent: 46ae11537137ce73b55b67343e67c6c469fdddd1
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Mar 31 15:06:30 2010 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Mar 31 15:41:40 2010 -0500
dlm_controld: don't skip unlinking checkpoint
This reverts commit c1e139fb328408891d054e577b33d724230dde43
which was wrong.
bz 578628
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
group/dlm_controld/plock.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index a534300..bf6ddfa 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -1709,9 +1709,6 @@ 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 ret;
-
unlink_retry:
rv = saCkptCheckpointUnlink(system_ckpt_handle, name);
if (rv == SA_AIS_ERR_TRY_AGAIN) {
@@ -1733,7 +1730,7 @@ static int _unlink_checkpoint(struct lockspace *ls, SaNameT *name)
goto status_retry;
}
if (rv != SA_AIS_OK) {
- log_error("unlink ckpt status error %d %s", rv, ls->name);
+ log_group(ls, "unlink ckpt status error %d %s", rv, ls->name);
goto out_close;
}