From 42ca37ba87f88bb255820922ca4c46ecb29943ec Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Sun, 24 Nov 2024 14:09:34 -0500 Subject: [PATCH] mount.nfs: retry NFSv3 mount after NFSv4 failure in auto negotiation (RHEL-68574) Signed-off-by: Steve Dickson Resolves: RHEL-68574 --- nfs-utils-2.5.4-mount-v3-retry.patch | 12 ++++++++++++ nfs-utils.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 nfs-utils-2.5.4-mount-v3-retry.patch diff --git a/nfs-utils-2.5.4-mount-v3-retry.patch b/nfs-utils-2.5.4-mount-v3-retry.patch new file mode 100644 index 0000000..aff6f3d --- /dev/null +++ b/nfs-utils-2.5.4-mount-v3-retry.patch @@ -0,0 +1,12 @@ +diff -up nfs-utils-2.5.4/utils/mount/stropts.c.orig nfs-utils-2.5.4/utils/mount/stropts.c +--- nfs-utils-2.5.4/utils/mount/stropts.c.orig 2024-11-24 08:36:03.734689817 -0500 ++++ nfs-utils-2.5.4/utils/mount/stropts.c 2024-11-24 08:37:52.541239493 -0500 +@@ -973,7 +973,7 @@ fall_back: + if ((result = nfs_try_mount_v3v2(mi, FALSE))) + return result; + +- if (errno != EBUSY && errno != EACCES) ++ if (errno != EBUSY && errno != EACCES && errno != ETIMEDOUT) + errno = olderrno; + + return result; diff --git a/nfs-utils.spec b/nfs-utils.spec index f477472..ab63cf7 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -70,6 +70,7 @@ Patch027: nfs-utils-2.5.4-gssd-segfault.patch # Patch028: nfs-utils-2.5.4-rpcidmapd-nfsopen-failure.patch Patch029: nfs-utils-2.5.4-mount-writable.patch +Patch030: nfs-utils-2.5.4-mount-v3-retry.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch @@ -513,6 +514,7 @@ fi %changelog * Sun Nov 24 2024 Steve Dickson 2.5.4-28 - Makefile.am: allow mount.nfs to be writeable by owner (RHEL-68701) +- mount.nfs: retry NFSv3 mount after NFSv4 failure in auto negotiation (RHEL-68574) * Thu Nov 14 2024 Steve Dickson 2.5.4-28 - rpc.idmapd: nfsopen() failures should not be fatal (RHEL-65727)