diff options
| author | markj <markj@FreeBSD.org> | 2017-07-24 16:24:22 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2017-07-24 16:24:22 +0000 |
| commit | cf39a4b6540ef0355a04456a1433ac6b2931ef87 (patch) | |
| tree | cca60d92d83e6559abee97232b73a52115ceaef0 /usr.bin | |
| parent | 16b9d04a03006704bfd84a4ac826cb0e0b135b67 (diff) | |
| download | FreeBSD-src-cf39a4b6540ef0355a04456a1433ac6b2931ef87.zip FreeBSD-src-cf39a4b6540ef0355a04456a1433ac6b2931ef87.tar.gz | |
MFC r321356:
Fix top(1) output when zfs.ko is loaded but ZFS is not in use.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/top/machine.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index 5980c03..992c096 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -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) { |
