From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4025-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 17132 invoked by alias); 10 Mar 2011 22:39:38 -0000
Received: (qmail 17115 invoked by uid 9737); 10 Mar 2011 22:39:38 -0000
Date: Thu, 10 Mar 2011 22:39:00 -0000
Message-ID: <20110310223938.17113.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/metadata metadata.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: 2011-03/txt/msg00047.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-03-10 22:39:37

Modified files:
	lib/metadata   : metadata.c 

Log message:
	Missed merge fix in vg_validate patch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.440&r2=1.441

--- LVM2/lib/metadata/metadata.c	2011/03/10 14:40:32	1.440
+++ LVM2/lib/metadata/metadata.c	2011/03/10 22:39:36	1.441
@@ -2380,8 +2380,8 @@
 			break;
 		}
 
-		if (!dm_hash_insert_binary(lvid_hash, lvl->lv->lvid.id,
-					   sizeof(lvl->lv->lvid.id), lvl->lv)) {
+		if (!dm_hash_insert_binary(lvid_hash, &lvl->lv->lvid.id[1],
+					   sizeof(lvl->lv->lvid.id[1]), lvl->lv)) {
 			log_error("Failed to hash lvid.");
 			r = 0;
 			break;