From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8989 invoked by alias); 8 Dec 2011 18:19:06 -0000 Received: (qmail 8970 invoked by uid 9447); 8 Dec 2011 18:19:06 -0000 Date: Thu, 08 Dec 2011 18:19:00 -0000 Message-ID: <20111208181906.8968.qmail@sourceware.org> From: agk@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: 2011-12/txt/msg00013.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: agk@sourceware.org 2011-12-08 18:19:05 Modified files: lib/locking : cluster_locking.c Log message: Don't pass LCK_LOCAL to clvmd - it's unused. Pass LCK_CLUSTER_VG in args[0] instead of args[1]. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/locking/cluster_locking.c.diff?cvsroot=lvm2&r1=1.62&r2=1.63 --- LVM2/lib/locking/cluster_locking.c 2011/11/30 17:02:37 1.62 +++ LVM2/lib/locking/cluster_locking.c 2011/12/08 18:19:05 1.63 @@ -320,9 +320,10 @@ args = alloca(len); strcpy(args + 2, name); - /* Mask off lock flags */ - args[0] = flags & (LCK_SCOPE_MASK | LCK_TYPE_MASK | LCK_NONBLOCK | LCK_HOLD); - args[1] = flags & (LCK_LOCAL | LCK_CLUSTER_VG); + /* args[0] holds bottom 8 bits except LCK_LOCAL (0x40). */ + args[0] = flags & (LCK_SCOPE_MASK | LCK_TYPE_MASK | LCK_NONBLOCK | LCK_HOLD | LCK_CLUSTER_VG); + + args[1] = 0; if (flags & LCK_ORIGIN_ONLY) args[1] |= LCK_ORIGIN_ONLY_MODE; @@ -492,7 +493,7 @@ return 0; } - log_very_verbose("Locking %s %s %s (%s%s%s%s%s%s%s) (0x%x)", lock_scope, lockname, + log_very_verbose("Locking %s %s %s (%s%s%s%s%s%s%s%s) (0x%x)", lock_scope, lockname, lock_type, lock_scope, flags & LCK_NONBLOCK ? "|NONBLOCK" : "", flags & LCK_HOLD ? "|HOLD" : "", @@ -500,6 +501,7 @@ flags & LCK_CLUSTER_VG ? "|CLUSTER" : "", flags & LCK_CACHE ? "|CACHE" : "", flags & LCK_ORIGIN_ONLY ? "|ORIGIN_ONLY" : "", + flags & LCK_REVERT ? "|REVERT" : "", flags); /* Send a message to the cluster manager */