summaryrefslogtreecommitdiffstats
path: root/daemons/lvmetad/lvmetad-core.c
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2011-07-20 21:27:28 +0000
committerPetr Rockai <prockai@redhat.com>2011-07-20 21:27:28 +0000
commitbc0a90243458df406e0431a29d32c49fc0e6efdb (patch)
treea44e49112a362b8b706bb82631b193ff8d402d70 /daemons/lvmetad/lvmetad-core.c
parentfba6c62b84bd3e75bbde8a678cc310281c88b08b (diff)
downloadlvm2-bc0a90243458df406e0431a29d32c49fc0e6efdb.tar.gz
lvm2-bc0a90243458df406e0431a29d32c49fc0e6efdb.tar.xz
lvm2-bc0a90243458df406e0431a29d32c49fc0e6efdb.zip
lvmetad: Fix a possible infinite loop in vg_status.
Diffstat (limited to 'daemons/lvmetad/lvmetad-core.c')
-rw-r--r--daemons/lvmetad/lvmetad-core.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c
index a30c4021..c6c220d9 100644
--- a/daemons/lvmetad/lvmetad-core.c
+++ b/daemons/lvmetad/lvmetad-core.c
@@ -166,11 +166,8 @@ static int vg_status(lvmetad_state *s, const char *vgid)
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);