From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21282 invoked by alias); 6 Apr 2010 14:04:04 -0000 Received: (qmail 21165 invoked by uid 9657); 6 Apr 2010 14:04:03 -0000 Date: Tue, 06 Apr 2010 14:04:00 -0000 Message-ID: <20100406140403.21163.qmail@sourceware.org> From: wysochanski@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/lib/format_text import_vsn1.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/msg00016.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2010-04-06 14:04:03 Modified files: lib/format_text: import_vsn1.c Log message: Refactor _read_pv() code that updates vg->extent_count and vg->free_count. Simple refactor to mov code that updates the vg extent counts from a single pv's counts close to the code that adds a pv to vg->pvs and updates vg->pv_count. No functional change. Signed-off-by: Dave Wysochanski Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/import_vsn1.c.diff?cvsroot=lvm2&r1=1.71&r2=1.72 --- LVM2/lib/format_text/import_vsn1.c 2010/04/01 10:34:10 1.71 +++ LVM2/lib/format_text/import_vsn1.c 2010/04/06 14:04:03 1.72 @@ -241,10 +241,6 @@ return 0; } - /* adjust the volume group. */ - vg->extent_count += pv->pe_count; - vg->free_count += pv->pe_count; - pv->pe_size = vg->extent_size; pv->pe_alloc_count = 0; @@ -273,6 +269,8 @@ if (!alloc_pv_segment_whole_pv(mem, pv)) return_0; + vg->extent_count += pv->pe_count; + vg->free_count += pv->pe_count; vg->pv_count++; dm_list_add(&vg->pvs, &pvl->list);