The branch releng/14.3 has been updated by mav:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=93839cddbd08c5b866e83bda432da4eafd336415

commit 93839cddbd08c5b866e83bda432da4eafd336415
Author:     Alexander Motin <m...@freebsd.org>
AuthorDate: 2025-05-25 18:23:54 +0000
Commit:     Alexander Motin <m...@freebsd.org>
CommitDate: 2025-05-28 02:20:01 +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.
    
    Approved by:    re (cperciva)
    
    (cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf)
    (cherry picked from commit f23326ff2c7cad9579061291b6de7feb5ea7302a)
---
 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 889ce39a6c32..ade0f41b0b2a 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -304,9 +304,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);

Reply via email to