From 5bf1500ee3a9e9b72ac67b62b9ffdfce5bc4a4fe Mon Sep 17 00:00:00 2001
From: Shengqi Chen <harry-chen@outlook.com>
Date: Tue, 9 Sep 2025 17:46:40 +0800
Subject: [PATCH] Remove renaming notice and symlinks for arcstat and
 arc_summary

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Colm Buckley <colm@tuatha.org>
Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
Closes #16357
Closes #17712
---
 cmd/Makefile.am                         | 5 -----
 cmd/arc_summary                         | 7 -------
 cmd/arcstat.in                          | 7 -------
 contrib/debian/openzfs-zfsutils.install | 2 --
 contrib/debian/rules.in                 | 2 --
 man/man1/arcstat.1                      | 2 --
 rpm/generic/zfs.spec.in                 | 2 --
 7 files changed, 27 deletions(-)

diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index e79bfae2b..c1c4e2fe1 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -107,11 +107,6 @@ $(call SUBST,dbufstat,%D%/)
 $(call SUBST,zilstat,%D%/)
 arc_summary: %D%/arc_summary
 	$(AM_V_at)cp $< $@
-
-cmd-rename-install-exec-hook:
-	$(LN_S) -f arcstat $(DESTDIR)$(bindir)/zarcstat
-	$(LN_S) -f arc_summary $(DESTDIR)$(bindir)/zarcsummary
-INSTALL_EXEC_HOOKS += cmd-rename-install-exec-hook
 endif
 
 PHONY += cmd
diff --git a/cmd/arc_summary b/cmd/arc_summary
index 9538dd599..e60c6b64e 100755
--- a/cmd/arc_summary
+++ b/cmd/arc_summary
@@ -1021,13 +1021,6 @@ def main():
     treated separately because they come with their own call.
     """
 
-    # notify user for upcoming renaming in 2.4.0
-    abs_path = os.path.abspath(sys.argv[0].strip())
-    script_name = os.path.basename(abs_path)
-    if script_name != "zarcsummary":
-        sys.stderr.write("Note: this script will be renamed to zarcsummary in ")
-        sys.stderr.write("zfs 2.4.0. Please migrate ASAP.\n")
-
     kstats = get_kstats()
 
     if ARGS.graph:
diff --git a/cmd/arcstat.in b/cmd/arcstat.in
index e153eddb3..10115aeb1 100755
--- a/cmd/arcstat.in
+++ b/cmd/arcstat.in
@@ -768,13 +768,6 @@ def calculate():
 
 def main():
 
-    # notify user for upcoming renaming in 2.4.0
-    abs_path = os.path.abspath(sys.argv[0].strip())
-    script_name = os.path.basename(abs_path)
-    if script_name != "zarcstat":
-        sys.stderr.write("Note: this script will be renamed to zarcstat in ")
-        sys.stderr.write("zfs 2.4.0. Please migrate ASAP.\n")
-
     global sint
     global count
     global hdr_intr
diff --git a/contrib/debian/openzfs-zfsutils.install b/contrib/debian/openzfs-zfsutils.install
index 2362c83df..37284a78a 100644
--- a/contrib/debian/openzfs-zfsutils.install
+++ b/contrib/debian/openzfs-zfsutils.install
@@ -37,9 +37,7 @@ usr/lib/zfs-linux/zpool.d/
 usr/lib/zfs-linux/zpool_influxdb
 usr/lib/zfs-linux/zfs_prepare_disk
 usr/sbin/arc_summary
-usr/sbin/zarcsummary
 usr/sbin/arcstat
-usr/sbin/zarcstat
 usr/sbin/dbufstat
 usr/sbin/zilstat
 usr/share/zfs/compatibility.d/
diff --git a/contrib/debian/rules.in b/contrib/debian/rules.in
index 966e34bf9..2b0568938 100755
--- a/contrib/debian/rules.in
+++ b/contrib/debian/rules.in
@@ -82,9 +82,7 @@ override_dh_auto_install:
 	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
 	mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
 	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
-	mv '$(CURDIR)/debian/tmp/usr/bin/zarcsummary' '$(CURDIR)/debian/tmp/usr/sbin/zarcsummary'
 	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
-	mv '$(CURDIR)/debian/tmp/usr/bin/zarcstat' '$(CURDIR)/debian/tmp/usr/sbin/zarcstat'
 	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
 	mv '$(CURDIR)/debian/tmp/usr/bin/zilstat' '$(CURDIR)/debian/tmp/usr/sbin/zilstat'
 
diff --git a/man/man1/arcstat.1 b/man/man1/arcstat.1
index 288b98d57..fe2e0407e 100644
--- a/man/man1/arcstat.1
+++ b/man/man1/arcstat.1
@@ -20,8 +20,6 @@
 .Sh NAME
 .Nm arcstat
 .Nd report ZFS ARC and L2ARC statistics
-.Sh NOTICE
-It will be renamed to zarcstat in zfs 2.4.0. Please migrate ASAP.
 .Sh SYNOPSIS
 .Nm
 .Op Fl havxp
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index edcfdd2d7..1ce668e7b 100644
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -509,9 +509,7 @@ systemctl --system daemon-reload >/dev/null || true
 %{_bindir}/zvol_wait
 # Optional Python 3 scripts
 %{_bindir}/arc_summary
-%{_bindir}/zarcsummary
 %{_bindir}/arcstat
-%{_bindir}/zarcstat
 %{_bindir}/dbufstat
 %{_bindir}/zilstat
 # Man pages