From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-5124-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 13857 invoked by alias); 23 Feb 2012 19:03:49 -0000
Received: (qmail 13840 invoked by uid 9737); 23 Feb 2012 19:03:48 -0000
Date: Thu, 23 Feb 2012 19:03:00 -0000
Message-ID: <20120223190348.13838.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/cache lvmetad.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: 2012-02/txt/msg00158.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2012-02-23 19:03:48

Modified files:
	lib/cache      : lvmetad.c 

Log message:
	Fix regression from cleanup commit
	
	baton is being modified, so needs to be cleared before each use.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/cache/lvmetad.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3

--- LVM2/lib/cache/lvmetad.c	2012/02/23 17:59:32	1.2
+++ LVM2/lib/cache/lvmetad.c	2012/02/23 19:03:48	1.3
@@ -229,7 +229,7 @@
 	char mda_id[128], *num;
 	struct pv_list *pvl;
 	struct lvmcache_info *info;
-	struct _fixup_baton baton = { .i = 0 };
+	struct _fixup_baton baton;
 
 	if (!vg)
 		return 0;
@@ -264,6 +264,7 @@
 			*num = 0;
 			++num;
 			if ((info = lvmcache_info_from_pvid(mda_id, 0))) {
+				memset(&baton, 0, sizeof(baton));
 				baton.find = atoi(num);
 				baton.ignore = mda_is_ignored(mda);
 				lvmcache_foreach_mda(info, _fixup_ignored, &baton);