From 0f1917afa70820b21502bdcaa80868d502b73fb5 Mon Sep 17 00:00:00 2001 From: Christine Caulfield Date: Tue, 10 Feb 2009 13:22:18 +0000 Subject: [PATCH] Remove duplicate cpg_initialize from clvmd startup. --- WHATS_NEW | 1 + daemons/clvmd/clvmd-corosync.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 852c00d57..23bf1fa3a 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.45 - =================================== + Remove duplicate cpg_initialize from clvmd startup. Add option to /etc/sysconfig/cluster to select cluster type for clvmd. Allow clvmd to start up if its lockspace already exists. Separate PV label attributes which do not need parse metadata when reporting. diff --git a/daemons/clvmd/clvmd-corosync.c b/daemons/clvmd/clvmd-corosync.c index 5a2c137b1..427ac7fe7 100644 --- a/daemons/clvmd/clvmd-corosync.c +++ b/daemons/clvmd/clvmd-corosync.c @@ -326,11 +326,6 @@ static int _init_cluster(void) dlm_ls_pthread_init(lockspace); DEBUGLOG("DLM initialisation complete\n"); - err = cpg_initialize(&cpg_handle, &cpg_callbacks); - if (err != CS_OK) { - return cs_to_errno(err); - } - /* Connect to the clvmd group */ strcpy((char *)cpg_group_name.value, "clvmd"); cpg_group_name.length = strlen((char *)cpg_group_name.value);