From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8190 invoked by alias); 21 Jul 2010 15:21:26 -0000 Received: (qmail 8175 invoked by uid 9478); 21 Jul 2010 15:21:25 -0000 Date: Wed, 21 Jul 2010 15:21:00 -0000 Message-ID: <20100721152125.8173.qmail@sourceware.org> From: jbrassow@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/lib/mirror mirrored.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: 2010-07/txt/msg00083.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: jbrassow@sourceware.org 2010-07-21 15:21:25 Modified files: lib/mirror : mirrored.c Log message: Building without the '--enable-cmirrord' option means that CMIRRORD_PIDFILE is not defined. This makes the build fail. Therefore, we need to conditionalize the check for cmirrord based on if CMIRRORD_PIDFILE is defined. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.73&r2=1.74 --- LVM2/lib/mirror/mirrored.c 2010/07/21 13:40:22 1.73 +++ LVM2/lib/mirror/mirrored.c 2010/07/21 15:21:24 1.74 @@ -528,10 +528,15 @@ * otherwise, the kernel module will fail to make * contact. */ +#ifdef CMIRRORD_PIDFILE if (!dm_daemon_is_running(CMIRRORD_PIDFILE)) { log_verbose("Cluster mirror log daemon is not running"); _mirror_attributes &= ~MIRROR_LOG_CLUSTERED; } +#else + log_verbose("Cluster mirror log daemon not included in build"); + _mirror_attributes &= ~MIRROR_LOG_CLUSTERED; +#endif } *attributes = _mirror_attributes; }