From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2644-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 22840 invoked by alias); 15 Jan 2010 16:00:26 -0000
Received: (qmail 22821 invoked by uid 9478); 15 Jan 2010 16:00:24 -0000
Date: Fri, 15 Jan 2010 16:00:00 -0000
Message-ID: <20100115160024.22819.qmail@sourceware.org>
From: jbrassow@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/libdm libdm-deptree.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-01/txt/msg00091.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	jbrassow@sourceware.org	2010-01-15 16:00:23

Modified files:
	libdm          : libdm-deptree.c 

Log message:
	Off-by-one count was causing not all the mirror table parameters
	that were necessary to be passed on to userspace.
	
	The cluster mirror table (log portion only) used to look like this:
	clustered-disk <parm_count> <disk> <region_size> <uuid> \
	[[no]sync] [block_on_error]
	Now it looks like this:
	userspace <parm_count> <uuid> clustered-disk <disk> <region_size> \
	[[no]sync]
	
	So, there is one extra argument in the latter case - this was
	unaccounted for.
	
	Signed-off-by: Jonathan Brassow <jbrassow@redhat.com>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.70&r2=1.71

--- LVM2/libdm/libdm-deptree.c	2010/01/14 10:15:23	1.70
+++ LVM2/libdm/libdm-deptree.c	2010/01/15 16:00:23	1.71
@@ -1408,6 +1408,9 @@
 
 		if (!dm_log_userspace)
 			EMIT_PARAMS(pos, "clustered-");
+		else
+			/* For clustered-* type field inserted later */
+			log_parm_count++;
 	}
 
 	if (!seg->log)