Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)
src/netapp.c

index 1615c49..87f6cbd 100644 (file)
@@ -1590,6 +1590,9 @@ static int cna_handle_volume_usage_data (const host_config_t *host, /* {{{ */
                if (sis == NULL)
                        continue;
 
+               if (na_elem_child(sis, "sis-info"))
+                       sis = na_elem_child(sis, "sis-info");
+               
                sis_state = na_child_get_string(sis, "state");
                if (sis_state == NULL)
                        continue;