From 003fa0e06441887e830c840d51c1b1f54cdbd731 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 23 2022 14:22:55 +0000
Subject: import nfs-utils-2.3.3-50.el8


---

diff --git a/SOURCES/nfs-utils-2.3.3-mount-ebusy.patch b/SOURCES/nfs-utils-2.3.3-mount-ebusy.patch
new file mode 100644
index 0000000..890c553
--- /dev/null
+++ b/SOURCES/nfs-utils-2.3.3-mount-ebusy.patch
@@ -0,0 +1,14 @@
+diff -up nfs-utils-2.3.3/utils/mount/stropts.c.orig nfs-utils-2.3.3/utils/mount/stropts.c
+--- nfs-utils-2.3.3/utils/mount/stropts.c.orig	2022-02-14 11:28:51.570084952 -0500
++++ nfs-utils-2.3.3/utils/mount/stropts.c	2022-02-14 11:29:16.174450628 -0500
+@@ -966,7 +966,9 @@ fall_back:
+ 	if ((result = nfs_try_mount_v3v2(mi, FALSE)))
+ 		return result;
+ 
+-	errno = olderrno;
++	if (errno != EBUSY && errno != EACCES)
++		errno = olderrno;
++
+ 	return result;
+ }
+ 
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
index 5a2c7a1..f8fe8a2 100644
--- a/SPECS/nfs-utils.spec
+++ b/SPECS/nfs-utils.spec
@@ -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.3.3
-Release: 48%{?dist}
+Release: 50%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -89,6 +89,7 @@ Patch045: nfs-utils-2.3.3-gssd-mutex-refcnt.patch
 # RHEL 8.6
 Patch046: nfs-utils-2.3.3-mountd-v4-logging.patch
 Patch047: nfs-utils-2.3.3-gssd-printerr.patch
+Patch048: nfs-utils-2.3.3-mount-ebusy.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -364,6 +365,12 @@ fi
 %{_libdir}/libnfsidmap.so
 
 %changelog
+* Sat Feb 19 2022 Steve Dickson <steved@redhat.com> 2.3.3-50
+- mount.nfs: Fix Typo auto negotiating code. (bz 1946346)
+
+* Mon Feb 14 2022 Steve Dickson <steved@redhat.com> 2.3.3-49
+- mount.nfs Fix error reporting for already mounted shares (bz 1946346)
+
 * Thu Nov 4 2021 Steve Dickson <steved@redhat.com> 2.3.3-48
 - gssd: fix crash in debug message (bz 1988283)