From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4298-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 9158 invoked by alias); 20 Jul 2011 21:27:29 -0000
Received: (qmail 9138 invoked by uid 9699); 20 Jul 2011 21:27:29 -0000
Date: Wed, 20 Jul 2011 21:27:00 -0000
Message-ID: <20110720212729.9136.qmail@sourceware.org>
From: mornfall@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/daemons/lvmetad lvmetad-core.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-07/txt/msg00054.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2011-07-20 21:27:29

Modified files:
	daemons/lvmetad: lvmetad-core.c 

Log message:
	lvmetad: Fix a possible infinite loop in vg_status.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/lvmetad-core.c.diff?cvsroot=lvm2&r1=1.17&r2=1.18

--- LVM2/daemons/lvmetad/lvmetad-core.c	2011/07/20 21:26:18	1.17
+++ LVM2/daemons/lvmetad/lvmetad-core.c	2011/07/20 21:27:28	1.18
@@ -166,11 +166,8 @@
 
 	while (pv) {
 		const char *uuid = find_config_str(pv->child, "id", NULL);
-		if (!uuid)
-			continue; // FIXME?
-
 		lock_pvs(s);
-		int found = dm_hash_lookup(s->pvs, uuid) ? 1 : 0;
+		int found = uuid ? (dm_hash_lookup(s->pvs, uuid) ? 1 : 0) : 0;
 		unlock_pvs(s);
 		if (!found) {
 			unlock_vg(s, vgid);