From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3275 invoked by alias); 17 Aug 2006 19:53:37 -0000 Received: (qmail 3262 invoked by uid 9447); 17 Aug 2006 19:53:37 -0000 Date: Thu, 17 Aug 2006 19:53:00 -0000 Message-ID: <20060817195337.3260.qmail@sourceware.org> From: agk@sourceware.org To: lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/format_text/format-text.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-08/txt/msg00009.txt.bz2 List-Id: CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: agk@sourceware.org 2006-08-17 19:53:36 Modified files: . : WHATS_NEW lib/format_text: format-text.c lib/metadata : metadata.c Log message: Fix PE_ALIGN for pagesize over 32KB. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.422&r2=1.423 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/format-text.c.diff?cvsroot=lvm2&r1=1.64&r2=1.65 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.96&r2=1.97 --- LVM2/WHATS_NEW 2006/08/17 19:30:59 1.422 +++ LVM2/WHATS_NEW 2006/08/17 19:53:35 1.423 @@ -1,5 +1,6 @@ Version 2.02.09 - ================================== + Fix PE_ALIGN for pagesize over 32KB. Separate out LVM1_PE_ALIGN and pe_align(). Add lvm_getpagesize wrapper. Add --maxphysicalvolumes to vgchange. --- LVM2/lib/format_text/format-text.c 2006/08/17 19:30:59 1.64 +++ LVM2/lib/format_text/format-text.c 2006/08/17 19:53:35 1.65 @@ -1193,7 +1193,7 @@ list_iterate_items(mda, &info->mdas) { mdac = (struct mda_context *) mda->metadata_locn; if (pv->dev == mdac->area.dev && - (mdac->area.start < (pv->pe_start << SECTOR_SHIFT)) && + (mdac->area.start <= (pv->pe_start << SECTOR_SHIFT)) && (mdac->area.start + mdac->area.size > (pv->pe_start << SECTOR_SHIFT))) { pv->pe_start = (mdac->area.start + mdac->area.size) --- LVM2/lib/metadata/metadata.c 2006/08/17 19:30:59 1.96 +++ LVM2/lib/metadata/metadata.c 2006/08/17 19:53:36 1.97 @@ -24,9 +24,11 @@ #include "pv_alloc.h" #include "activate.h" +#include + unsigned long pe_align(void) { - return (65536UL >> SECTOR_SHIFT); + return MAX(65536UL, lvm_getpagesize()) >> SECTOR_SHIFT; } static int _add_pv_to_vg(struct format_instance *fid, struct volume_group *vg,