Code

Revert "lvm: Fix segfault if a VG contains no LVs"
authorBenjamin Gilbert <bgilbert@cs.cmu.edu>
Mon, 4 Aug 2014 17:29:56 +0000 (13:29 -0400)
committerBenjamin Gilbert <bgilbert@cs.cmu.edu>
Mon, 4 Aug 2014 17:29:56 +0000 (13:29 -0400)
Avoid merge conflict with 25d7de9 in 5.4 branch, per #603.

This reverts commit 45805cf888cda0e840d774f1d42cd21525a722ea.

src/lvm.c

index 107766c33ecf3f0395d9c4fb12b24a8bcdf807fd..cb073321240e8ed8c379e8abefe704957bc249d3 100644 (file)
--- 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");