From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13020 invoked by alias); 2 Sep 2009 21:27:56 -0000 Received: (qmail 13006 invoked by uid 9657); 2 Sep 2009 21:27:55 -0000 Date: Wed, 02 Sep 2009 21:27:00 -0000 Message-ID: <20090902212755.13004.qmail@sourceware.org> From: wysochanski@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/tools vgmerge.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/msg00018.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2009-09-02 21:27:55 Modified files: tools : vgmerge.c Log message: Refactor vgmerge - introduce lock_vg_from_first flag. Should be no functional change. Author: Dave Wysochanski Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgmerge.c.diff?cvsroot=lvm2&r1=1.60&r2=1.61 --- LVM2/tools/vgmerge.c 2009/07/08 14:33:17 1.60 +++ LVM2/tools/vgmerge.c 2009/09/02 21:27:55 1.61 @@ -21,6 +21,7 @@ struct volume_group *vg_to, *vg_from; struct lv_list *lvl1, *lvl2; int r = ECMD_FAILED; + int lock_vg_from_first = 0; if (!strcmp(vg_name_to, vg_name_from)) { log_error("Duplicate volume group name \"%s\"", vg_name_from); @@ -116,8 +117,13 @@ vg_from->name, vg_to->name); r = ECMD_PROCESSED; bad: - unlock_and_release_vg(cmd, vg_from, vg_name_from); - unlock_and_release_vg(cmd, vg_to, vg_name_to); + 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; }