From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13275 invoked by alias); 13 Apr 2010 14:36:26 -0000 Received: (qmail 13261 invoked by uid 9664); 13 Apr 2010 14:36:25 -0000 Date: Tue, 13 Apr 2010 14:36:00 -0000 Message-ID: <20100413143625.13259.qmail@sourceware.org> From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/locking/cluster_locking.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-04/txt/msg00066.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2010-04-13 14:36:25 Modified files: . : WHATS_NEW lib/locking : cluster_locking.c Log message: Mask LCK_HOLD flag in cluster VG locks for compatibility reasons. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1512&r2=1.1513 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/locking/cluster_locking.c.diff?cvsroot=lvm2&r1=1.41&r2=1.42 --- LVM2/WHATS_NEW 2010/04/13 01:54:32 1.1512 +++ LVM2/WHATS_NEW 2010/04/13 14:36:24 1.1513 @@ -1,5 +1,6 @@ Version 2.02.63 - ================================ + Mask LCK_HOLD flag in cluster VG locks for compatibility reasons. Add activation/polling_interval to lvm.conf as --interval default. Don't ignore error if resuming any LV fails in resume_lvs. Skip closing persistent filter cache file if open failed. --- LVM2/lib/locking/cluster_locking.c 2010/03/26 15:40:14 1.41 +++ LVM2/lib/locking/cluster_locking.c 2010/04/13 14:36:25 1.42 @@ -415,6 +415,13 @@ lock_scope = "VG"; clvmd_cmd = CLVMD_CMD_LOCK_VG; + /* + * Old clvmd does not expect LCK_HOLD which was already processed + * in lock_vol, mask it for compatibility reasons. + */ + if (flags != LCK_VG_COMMIT && flags != LCK_VG_REVERT) + flags &= ~LCK_HOLD; + break; case LCK_LV: