X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=f0d23239a82ab158c03c669f9a96cf2fc7f8dd24;hb=e9ecee2a61356a293f086dd3d36d2381486b563e;hp=168d566bb47ff406f0deb183c5c9d7550211e969;hpb=3aeea86c1adde5caa7bf18f5054b5acbf359546e;p=collectd.git

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index 168d566b..f0d23239 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -208,7 +208,7 @@ static int za_read (void)
 		{
 			llentry_t *e;
 			llvalues = malloc(sizeof(long long int) * i);
-			i = 0;
+			int j = 0;
 
 			pnl = file_contents;
 			while (pnl != NULL)
@@ -220,9 +220,9 @@ static int za_read (void)
 				numfields = strsplit (pnl, fields, 4);
 				if (numfields == 3)
 				{
-					llvalues[i] = atoll (fields[2]);
+					llvalues[j] = atoll (fields[2]);
 
-					e = llentry_create (fields[0], &llvalues[i]);
+					e = llentry_create (fields[0], &llvalues[j]);
 					if (e == NULL)
 					{
 						ERROR ("zfs_arc plugin: `llentry_create' failed.");
@@ -231,6 +231,7 @@ static int za_read (void)
 					{
 						llist_append (ksp, e);
 					}
+					j++;
 				}
 				pnl = pnnl;
 				if (pnl != NULL)
@@ -250,7 +251,14 @@ static int za_read (void)
 
 	/* Sizes */
 	za_read_gauge (ksp, "size",    "cache_size", "arc");
-	za_read_gauge (ksp, "l2_size", "cache_size", "L2");
+
+	/* The "l2_size" value has disappeared from Solaris some time in
+	 * early 2013, and has only reappeared recently in Solaris 11.2.
+	 * Stop trying if we ever fail to read it, so we don't spam the log.
+	 */
+	static int l2_size_avail = 1;
+	if (l2_size_avail && za_read_gauge (ksp, "l2_size", "cache_size", "L2") != 0)
+		l2_size_avail = 0;
 
 	/* Operations */
 	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");