From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16121 invoked by alias); 7 Oct 2006 11:00:11 -0000 Received: (qmail 16107 invoked by uid 9447); 7 Oct 2006 11:00:11 -0000 Date: Sat, 07 Oct 2006 11:00:00 -0000 Message-ID: <20061007110011.16105.qmail@sourceware.org> From: agk@sourceware.org To: lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/metadata/lv_manip.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2006-10/txt/msg00017.txt.bz2 List-Id: CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: agk@sourceware.org 2006-10-07 11:00:10 Modified files: . : WHATS_NEW lib/metadata : lv_manip.c Log message: Remove duplicated pv arg from _check_contiguous(). Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.458&r2=1.459 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv_manip.c.diff?cvsroot=lvm2&r1=1.103&r2=1.104 --- LVM2/WHATS_NEW 2006/10/07 10:47:05 1.458 +++ LVM2/WHATS_NEW 2006/10/07 11:00:09 1.459 @@ -1,5 +1,6 @@ Version 2.02.11 - ===================================== + Remove duplicated pv arg from _check_contiguous(). Accept regionsize with lvconvert. Add report columns with underscore before field names ending 'size'. Correct regionsize default on lvcreate man page (MB). --- LVM2/lib/metadata/lv_manip.c 2006/10/05 21:24:48 1.103 +++ LVM2/lib/metadata/lv_manip.c 2006/10/07 11:00:09 1.104 @@ -683,8 +683,7 @@ /* * Is pva contiguous to any existing areas or on the same PV? */ -static int _check_contiguous(struct lv_segment *prev_lvseg, - struct physical_volume *pv, struct pv_area *pva, +static int _check_contiguous(struct lv_segment *prev_lvseg, struct pv_area *pva, struct pv_area **areas, uint32_t areas_size) { struct pv_segment *prev_pvseg; @@ -696,7 +695,7 @@ lastseg = list_item(list_last(&seg_lv(prev_lvseg, s)->segments), struct lv_segment); /* FIXME For more areas supply flattened prev_lvseg to ensure consistency */ if (lastseg->area_count == 1 && - _check_contiguous(lastseg, pv, pva, &areas[s], 1)) + _check_contiguous(lastseg, pva, &areas[s], 1)) return 1; continue; } @@ -704,7 +703,7 @@ if (!(prev_pvseg = seg_pvseg(prev_lvseg, s))) continue; /* FIXME Broken */ - if ((prev_pvseg->pv != pv)) + if ((prev_pvseg->pv != pva->map->pv)) continue; if (prev_pvseg->pe + prev_pvseg->len == pva->start) { @@ -802,7 +801,6 @@ if (contiguous) { if (prev_lvseg && _check_contiguous(prev_lvseg, - pvm->pv, pva, areas, areas_size)) { contiguous_count++;