From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31065 invoked by alias); 9 Dec 2009 18:28:28 -0000 Received: (qmail 31049 invoked by uid 9664); 9 Dec 2009 18:28:27 -0000 Date: Wed, 09 Dec 2009 18:28:00 -0000 Message-ID: <20091209182827.31047.qmail@sourceware.org> From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/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: 2009-12/txt/msg00018.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2009-12-09 18:28:27 Modified files: lib/locking : cluster_locking.c Log message: Get rid of magic masks in cluster locking code. Patch should not cause any problems, only real change is removing LCK_LOCAL bit from lock type flag, it is never used there. (LCK_LOCAL is part arg[1] bits anyway.) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/locking/cluster_locking.c.diff?cvsroot=lvm2&r1=1.37&r2=1.38 --- LVM2/lib/locking/cluster_locking.c 2009/12/09 18:16:38 1.37 +++ LVM2/lib/locking/cluster_locking.c 2009/12/09 18:28:27 1.38 @@ -317,8 +317,9 @@ args = alloca(len); strcpy(args + 2, name); - args[0] = flags & 0x7F; /* Maskoff lock flags */ - args[1] = flags & 0xC0; /* Bitmap flags */ + /* Maskoff lock flags */ + args[0] = flags & (LCK_SCOPE_MASK | LCK_TYPE_MASK | LCK_NONBLOCK | LCK_HOLD); + args[1] = flags & (LCK_LOCAL | LCK_CLUSTER_VG); if (mirror_in_sync()) args[1] |= LCK_MIRROR_NOSYNC_MODE;