From: Benjamin Gilbert <bgilbert@cs.cmu.edu>
Date: Mon, 4 Aug 2014 17:29:56 +0000 (-0400)
Subject: Revert "lvm: Fix segfault if a VG contains no LVs"
X-Git-Tag: collectd-5.5.0~232^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=dd5d9dcef333c5de208388dc8a42e7eae68a4d32;hp=5e2ed291e1e1b815e859acffcf81e9d2a5dc0cb6;p=collectd.git

Revert "lvm: Fix segfault if a VG contains no LVs"

Avoid merge conflict with 25d7de9 in 5.4 branch, per #603.

This reverts commit 45805cf888cda0e840d774f1d42cd21525a722ea.
---

diff --git a/src/lvm.c b/src/lvm.c
index 107766c3..cb073321 100644
--- a/src/lvm.c
+++ b/src/lvm.c
@@ -119,8 +119,6 @@ static void vg_read(vg_t vg, char const *vg_name)
     lvm_submit (vg_name, "free", lvm_vg_get_free_size(vg));
 
     lvs = lvm_vg_list_lvs(vg);
-    if (lvs == NULL)
-        return;
     dm_list_iterate_items(lvl, lvs) {
         name = lvm_lv_get_name(lvl->lv);
         attrs = get_lv_property_string(lvl->lv, "lv_attr");