Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jul 2017 16:24:22 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r321419 - stable/11/usr.bin/top
Message-ID:  <201707241624.v6OGOM1P080012@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Mon Jul 24 16:24:22 2017
New Revision: 321419
URL: https://svnweb.freebsd.org/changeset/base/321419

Log:
  MFC r321356:
  Fix top(1) output when zfs.ko is loaded but ZFS is not in use.

Modified:
  stable/11/usr.bin/top/machine.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/top/machine.c
==============================================================================
--- stable/11/usr.bin/top/machine.c	Mon Jul 24 16:23:28 2017	(r321418)
+++ stable/11/usr.bin/top/machine.c	Mon Jul 24 16:24:22 2017	(r321419)
@@ -328,14 +328,15 @@ machine_init(struct statics *statics, char do_unames)
 	    size != sizeof(smpmode))
 		smpmode = 0;
 
-	size = sizeof(carc_en);
-	if (sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size,
-	    NULL, 0) == 0 && carc_en == 1)
-		carc_enabled = 1;
 	size = sizeof(arc_size);
 	if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc_size, &size,
 	    NULL, 0) == 0 && arc_size != 0)
 		arc_enabled = 1;
+	size = sizeof(carc_en);
+	if (arc_enabled &&
+	    sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size,
+	    NULL, 0) == 0 && carc_en == 1)
+		carc_enabled = 1;
 
 	if (do_unames) {
 	    while ((pw = getpwent()) != NULL) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707241624.v6OGOM1P080012>