d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed by:	allanjude
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D11693
This commit is contained in:
Mark Johnston 2017-07-21 23:53:48 +00:00
parent 5cf14660ae
commit 8781788d2b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/top/machine.c
View File

@ -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) {