From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1870-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 28668 invoked by alias); 28 Apr 2009 17:46:48 -0000
Received: (qmail 28651 invoked by uid 9657); 28 Apr 2009 17:46:47 -0000
Date: Tue, 28 Apr 2009 17:46:00 -0000
Message-ID: <20090428174647.28649.qmail@sourceware.org>
From: wysochanski@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: 2009-04/txt/msg00047.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-04-28 17:46:47

Modified files:
	lib/metadata   : metadata.c 

Log message:
	Fix error path in vg_make_handle().
	
	Enter the error condition if either of the allocations fail, and
	don't use dm_pool_zalloc if dm_pool_create fails.

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

--- LVM2/lib/metadata/metadata.c	2009/04/22 09:31:31	1.212
+++ LVM2/lib/metadata/metadata.c	2009/04/28 17:46:47	1.213
@@ -2595,7 +2595,7 @@
 	struct dm_pool *vgmem;
 
 	if (!vg) {
-		if (!(vgmem = dm_pool_create("lvm2 vg_handle", VG_MEMPOOL_CHUNK)) &&
+		if (!(vgmem = dm_pool_create("lvm2 vg_handle", VG_MEMPOOL_CHUNK)) ||
 		    !(vg = dm_pool_zalloc(vgmem, sizeof(*vg)))) {
 			log_error("Error allocating vg handle.");
 			if (vgmem)