From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 12 Aug 2019 07:47:19 +0000 (+0200)
Subject: Merge pull request #3246 from jplitza/zfsarc-skip-lines
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=2833df09d5c9ef55d40e24f86ce543770abb4633;hp=f21eda8e76ef57de65930d6f0370e5aeb3e10863;p=collectd.git

Merge pull request #3246 from jplitza/zfsarc-skip-lines

zfs_arc plugin: Fix skipping of leading lines
---

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index a3c24516..be93b9db 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -231,23 +231,6 @@ 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) {
-    ERROR("zfs_arc plugin: \"%s\" does not contain a single line.",
-          ZOL_ARCSTATS_FILE);
-    fclose(fh);
-    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);
-  }
-
   while (fgets(buffer, sizeof(buffer), fh) != NULL) {
     char *fields[3];
     value_t v;