summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e2ed29)
raw | patch | inline | side by side (parent: 5e2ed29)
author | Benjamin Gilbert <bgilbert@cs.cmu.edu> | |
Mon, 4 Aug 2014 17:29:56 +0000 (13:29 -0400) | ||
committer | Benjamin 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.
This reverts commit 45805cf888cda0e840d774f1d42cd21525a722ea.
src/lvm.c | patch | blob | history |
diff --git a/src/lvm.c b/src/lvm.c
index 107766c33ecf3f0395d9c4fb12b24a8bcdf807fd..cb073321240e8ed8c379e8abefe704957bc249d3 100644 (file)
--- a/src/lvm.c
+++ b/src/lvm.c
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");