Date: Wed, 28 May 2025 00:28:55 GMT From: Alexander Motin <mav@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c92ffde748d5 - stable/13 - systat/top: Update ZFS sysctl names Message-ID: <202505280028.54S0StOk036885@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=c92ffde748d5fa397964fbc4c1f6766858aeb337 commit c92ffde748d5fa397964fbc4c1f6766858aeb337 Author: Alexander Motin <mav@FreeBSD.org> AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin <mav@FreeBSD.org> CommitDate: 2025-05-28 00:27:55 +0000 systat/top: Update ZFS sysctl names Some of ARC statistic sysctls changed years ago, but those tools are still using legacy shims, that are going to be removed. MFC after: 3 days (cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf) --- usr.bin/systat/main.c | 6 +++--- usr.bin/top/machine.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index e6fc79b7ba59..be580aa2794e 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -296,9 +296,9 @@ display(void) size_t size = sizeof(arc[0]); if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc[0], &size, NULL, 0) == 0 ) { - GETSYSCTL("vfs.zfs.mfu_size", arc[1]); - GETSYSCTL("vfs.zfs.mru_size", arc[2]); - GETSYSCTL("vfs.zfs.anon_size", arc[3]); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc[1]); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc[2]); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc[3]); GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); GETSYSCTL("kstat.zfs.misc.arcstats.bonus_size", arc[6]); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index a76d77a80ce4..07a7119ad0c2 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -537,11 +537,11 @@ get_system_info(struct system_info *si) if (arc_enabled) { GETSYSCTL("kstat.zfs.misc.arcstats.size", arc_stat); arc_stats[0] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mfu_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc_stat); arc_stats[1] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mru_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc_stat); arc_stats[2] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.anon_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc_stat); arc_stats[3] = arc_stat >> 10; GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc_stat); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc_stat2);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505280028.54S0StOk036885>