From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26981 invoked by alias); 10 Feb 2009 13:22:19 -0000 Received: (qmail 26966 invoked by uid 9452); 10 Feb 2009 13:22:19 -0000 Date: Tue, 10 Feb 2009 13:22:00 -0000 Message-ID: <20090210132219.26964.qmail@sourceware.org> From: ccaulfield@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/clvmd-corosync.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2009-02/txt/msg00009.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: ccaulfield@sourceware.org 2009-02-10 13:22:19 Modified files: . : WHATS_NEW daemons/clvmd : clvmd-corosync.c Log message: Remove duplicate cpg_initialize from clvmd startup. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1040&r2=1.1041 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-corosync.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4 --- LVM2/WHATS_NEW 2009/02/10 11:53:33 1.1040 +++ LVM2/WHATS_NEW 2009/02/10 13:22:18 1.1041 @@ -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. --- LVM2/daemons/clvmd/clvmd-corosync.c 2009/02/10 11:52:40 1.3 +++ LVM2/daemons/clvmd/clvmd-corosync.c 2009/02/10 13:22:18 1.4 @@ -326,11 +326,6 @@ 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);