rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixes for RHEL-90562 and RHEL-137935

Browse Source 
- nfsiostat: normalize the mountpoints passed in from the command line

  If the mountpoint passed in from the command line contains a trailing
  '/' character, then nfsiostat winds up printing statistics for all
  mounts instead of printing statistics for the specific mount that was
  requested.

  Resolves: RHEL-90562

- Remove /var/lib/nfs/v4recovery

  Legacy client tracking has been disabled since the v6.8 kernel (nfsdcld
  is used for client tracking instead), so nfs-utils should no longer be
  creating the /var/lib/nfs/v4recovery directory.

  Keep the logic that removes the v4recovery directory in the %postun
  scriptlet.  That ensures that the directory is removed on package
  upgrades (eventually we can get rid of that too).

  Resolves: RHEL-137935

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
This commit is contained in:
Scott Mayhew 2026-02-05 16:26:34 -05:00
parent ecbe730045
commit 383e5345d7
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nfs-utils-2.8.3-nfsiostat-normalize-the-mountpoints-passed-in-from-t.patch Normal file
View File

@ -0,0 +1,35 @@
From 03b9c540152b0630427056c5ffe7ea5f4a65cd3d Mon Sep 17 00:00:00 2001
From: Scott Mayhew <smayhew@redhat.com>
Date: Mon, 26 Jan 2026 08:28:41 -0500
Subject: [nfs-utils PATCH] nfsiostat: normalize the mountpoints passed in from
the command line
If the mountpoint passed in from the command line contains a trailing
'/' character, then nfsiostat winds up printing statistics for all
mounts instead of printing statistics for the specific mount that was
requested.
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---
tools/nfs-iostat/nfs-iostat.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
index e46b1a83..69d24a11 100755
--- a/tools/nfs-iostat/nfs-iostat.py
+++ b/tools/nfs-iostat/nfs-iostat.py
@@ -589,8 +589,8 @@ client are listed.
(options, args) = parser.parse_args(sys.argv)
for arg in args[1:]:
- if arg in mountstats:
- origdevices += [arg]
+ if os.path.normpath(arg) in mountstats:
+ origdevices += [os.path.normpath(arg)]
elif not interval_seen:
try:
interval = int(arg)
--
2.52.0

10
nfs-utils.spec
View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils
URL: http://linux-nfs.org/
Version: 2.8.3
Release: 3%{?dist}
Release: 4%{?dist}
Epoch: 1
# group all 32bit related archs
@ -33,6 +33,7 @@ Patch009: nfs-utils-2.8.3-nfsdctl-Warning-Clean-Up.patch
Patch010: nfs-utils-2.8.3-rpc-statd-service-dependency.patch
Patch011: nfs-utils-2.8.3-nfsrahead-Modify-get_device_info-logic.patch
Patch012: nfs-utils-2.8.3-gssd-protect-kerberos-ticket-cache-access.patch
Patch013: nfs-utils-2.8.3-nfsiostat-normalize-the-mountpoints-passed-in-from-t.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch102: nfs-utils-1.2.5-idmap-errmsg.patch
@ -217,7 +218,6 @@ touch $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rmtab
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/statd/sm
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/statd/sm.bak
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/v4recovery
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nfsmount.conf.d
@ -297,7 +297,6 @@ rm -rf /etc/systemd/system/rpc-*.requires
%files
%config(noreplace) /etc/nfsmount.conf
%dir %{_sysconfdir}/exports.d
%dir %{_sharedstatedir}/nfs/v4recovery
%dir %attr(555, root, root) %{_sharedstatedir}/nfs/rpc_pipefs
%dir %{_sharedstatedir}/nfs
%dir %{_libexecdir}/nfs-utils
@ -406,7 +405,6 @@ rm -rf /etc/systemd/system/rpc-*.requires
%files -n nfsv4-client-utils
%config(noreplace) /etc/nfsmount.conf
%config(noreplace) %{_sysconfdir}/nfs.conf
%dir %{_sharedstatedir}/nfs/v4recovery
%dir %attr(555, root, root) %{_sharedstatedir}/nfs/rpc_pipefs
%dir %{_libexecdir}/nfs-utils
%config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
@ -447,6 +445,10 @@ rm -rf /etc/systemd/system/rpc-*.requires
%{_mandir}/*/nfsiostat.8.gz
%changelog
* Thu Feb 5 2026 Scott Mayhew <smayhew@redhat.com> 2.8.3-4
- nfsiostat: normalize the mountpoints passed in from the command line (RHEL-90562)
- Remove /var/lib/nfs/v4recovery (RHEL-137935)
* Fri Jan 9 2026 Scott Mayhew <smayhew@redhat.com> 2.8.3-3
- gssd: protect kerberos ticket cache access (RHEL-138461)