From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11174 invoked by alias); 25 Jan 2011 21:51:32 -0000 Received: (qmail 11157 invoked by uid 9737); 25 Jan 2011 21:51:31 -0000 Date: Tue, 25 Jan 2011 21:51:00 -0000 Message-ID: <20110125215131.11155.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW_DM libdm/libdm-report.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: 2011-01/txt/msg00082.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-01-25 21:51:31 Modified files: . : WHATS_NEW_DM libdm : libdm-report.c Log message: Initialize pool object for each row Fix assert abort of dmsetup (when compiled with pool debug) dmsetup splitname --nameprefixes --noheadings --rows gvg-a2 Move pool begin in the inner loop - otherwise it would using already 'ended' pool object. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.438&r2=1.439 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-report.c.diff?cvsroot=lvm2&r1=1.40&r2=1.41 --- LVM2/WHATS_NEW_DM 2011/01/10 14:51:33 1.438 +++ LVM2/WHATS_NEW_DM 2011/01/25 21:51:30 1.439 @@ -1,5 +1,6 @@ Version 1.02.62 - =================================== + Initialize pool object for each row in _output_as_rows(). Version 1.02.61 - 10th January 2011 =================================== --- LVM2/libdm/libdm-report.c 2010/11/19 13:17:27 1.40 +++ LVM2/libdm/libdm-report.c 2011/01/25 21:51:31 1.41 @@ -1006,11 +1006,6 @@ struct dm_report_field *field; struct row *row; - if (!dm_pool_begin_object(rh->mem, 512)) { - log_error("dm_report: Unable to allocate output line"); - return 0; - } - dm_list_iterate_items(fp, &rh->field_props) { if (fp->flags & FLD_HIDDEN) { dm_list_iterate_items(row, &rh->rows) { @@ -1020,6 +1015,11 @@ continue; } + if (!dm_pool_begin_object(rh->mem, 512)) { + log_error("dm_report: Unable to allocate output line"); + return 0; + } + if ((rh->flags & DM_REPORT_OUTPUT_HEADINGS)) { if (!dm_pool_grow_object(rh->mem, rh->fields[fp->field_num].heading, 0)) { log_error("dm_report: Failed to extend row for field name");