X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fzfs_arc.c;h=6c66fb1390d9afe8493aaa9fb992cabd7bf4ed2c;hp=e589184c2cf0fe6b898762270a47462c33d299fa;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=44844d81e8324ab04dd130e84c9f5f989b1a1781

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index e589184c..6c66fb13 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -99,6 +99,11 @@ static void free_zfs_values(kstat_t *ksp) {
 }
 
 #elif defined(KERNEL_SOLARIS)
+
+#if HAVE_KSTAT_H
+#include <kstat.h>
+#endif
+
 extern kstat_ctl_t *kc;
 
 static long long get_zfs_value(kstat_t *ksp, char *name) {
@@ -208,6 +213,18 @@ static int za_read(void) {
     return -1;
   }
 
+  /* Ignore the first two lines because they contain information about the rest
+   * of the file.
+   * See kstat_seq_show_headers module/spl/spl-kstat.c of the spl kernel module.
+   */
+  if ((fgets(buffer, sizeof(buffer), fh) == NULL) ||
+      (fgets(buffer, sizeof(buffer), fh) == NULL)) {
+    ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.",
+          ZOL_ARCSTATS_FILE);
+    fclose(fh);
+    return -1;
+  }
+
   ksp = llist_create();
   if (ksp == NULL) {
     ERROR("zfs_arc plugin: `llist_create' failed.");
@@ -223,13 +240,13 @@ static int za_read(void) {
     ERROR("zfs_arc plugin: \"%s\" does not contain a single line.",
           ZOL_ARCSTATS_FILE);
     fclose(fh);
-    return -1;
+    return (-1);
   }
   if (fgets(buffer, sizeof(buffer), fh) == NULL) {
     ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.",
           ZOL_ARCSTATS_FILE);
     fclose(fh);
-    return -1;
+    return (-1);
   }
 
   while (fgets(buffer, sizeof(buffer), fh) != NULL) {