Blame collectd-lvm-do-not-segfault-when-there-are-no-vgs.patch
|
 |
182a205 |
From 25d7de930baa8a25b232a6276e123ca692c1e710 Mon Sep 17 00:00:00 2001
|
|
|
182a205 |
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
|
|
|
182a205 |
Date: Thu, 20 Feb 2014 02:13:20 +0100
|
|
|
182a205 |
Subject: [PATCH 1/5] lvm: Do not segfault when there are no VGs
|
|
|
182a205 |
|
|
|
182a205 |
---
|
|
|
182a205 |
src/lvm.c | 5 +++++
|
|
|
182a205 |
1 file changed, 5 insertions(+)
|
|
|
182a205 |
|
|
|
182a205 |
diff --git a/src/lvm.c b/src/lvm.c
|
|
|
182a205 |
index 6ef3a7b2ae5b..12c621d0569f 100644
|
|
|
182a205 |
--- a/src/lvm.c
|
|
|
182a205 |
+++ b/src/lvm.c
|
|
|
182a205 |
@@ -53,6 +53,11 @@ static int vg_read(vg_t vg, char const *vg_name)
|
|
|
182a205 |
lvm_submit (vg_name, "free", lvm_vg_get_free_size(vg));
|
|
|
182a205 |
|
|
|
182a205 |
lvs = lvm_vg_list_lvs(vg);
|
|
|
182a205 |
+ if (!lvs) {
|
|
|
182a205 |
+ /* no VGs are defined, which is not an error per se */
|
|
|
182a205 |
+ return (0);
|
|
|
182a205 |
+ }
|
|
|
182a205 |
+
|
|
|
182a205 |
dm_list_iterate_items(lvl, lvs) {
|
|
|
182a205 |
lvm_submit(vg_name, lvm_lv_get_name(lvl->lv), lvm_lv_get_size(lvl->lv));
|
|
|
182a205 |
}
|
|
|
182a205 |
--
|
|
|
182a205 |
2.0.0
|
|
|
182a205 |
|