From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12245 invoked by alias); 2 Sep 2009 21:26:18 -0000 Received: (qmail 12226 invoked by uid 9657); 2 Sep 2009 21:26:18 -0000 Date: Wed, 02 Sep 2009 21:26:00 -0000 Message-ID: <20090902212618.12224.qmail@sourceware.org> From: wysochanski@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/tools vgsplit.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-09/txt/msg00012.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2009-09-02 21:26:18 Modified files: tools : vgsplit.c Log message: Refactor vgsplit - add 'lock_vg_from_first' flag. Introduce 'lock_vg_from_first' flag to retain which vg was locked first. Should be no functional change. Author: Dave Wysochanski Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgsplit.c.diff?cvsroot=lvm2&r1=1.87&r2=1.88 --- LVM2/tools/vgsplit.c 2009/09/02 21:26:01 1.87 +++ LVM2/tools/vgsplit.c 2009/09/02 21:26:18 1.88 @@ -218,6 +218,7 @@ int existing_vg = 0; int r = ECMD_FAILED; const char *lv_name; + int lock_vg_from_first = 1; if ((arg_count(cmd, name_ARG) + argc) < 3) { log_error("Existing VG, new VG and either physical volumes " @@ -427,7 +428,12 @@ r = ECMD_PROCESSED; bad: - unlock_and_release_vg(cmd, vg_to, vg_name_to); - unlock_and_release_vg(cmd, vg_from, vg_name_from); + if (lock_vg_from_first) { + unlock_and_release_vg(cmd, vg_to, vg_name_to); + unlock_and_release_vg(cmd, vg_from, vg_name_from); + } else { + unlock_and_release_vg(cmd, vg_from, vg_name_from); + unlock_and_release_vg(cmd, vg_to, vg_name_to); + } return r; }