rpms/nfs-utils/F-11 nfs-utils-1.2.0-permerrors.patch, NONE, 1.1 nfs-utils.spec, 1.230, 1.231

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14629

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-permerrors.patch 
Log Message:
Fixed incorrect error given when server is down (bz 521638)


nfs-utils-1.2.0-permerrors.patch:
 stropts.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE nfs-utils-1.2.0-permerrors.patch ---
diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-09 08:02:01.000000000 -0400
@@ -573,11 +573,7 @@ static int nfs_try_nfs23mount(struct nfs
 	if (nfs_sys_mount(mi, "nfs", *extra_opts))
 		return 1;
 
-	/*
-	 * The kernel returns EOPNOTSUPP if the RPC bind failed,
-	 * and EPROTONOSUPPORT if the version isn't supported.
-	 */
-	if (errno != EOPNOTSUPP && errno != EPROTONOSUPPORT)
+	if (nfs_is_permanent_error(errno))
 		return 0;
 
 	return nfs_retry_nfs23mount(mi);


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-11/nfs-utils.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- nfs-utils.spec	27 Jul 2009 18:14:37 -0000	1.230
+++ nfs-utils.spec	9 Sep 2009 12:05:12 -0000	1.231
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -23,6 +23,7 @@ Patch01: nfs-utils-1.1.0-smnotify-path.p
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
 Patch100: nfs-utils-1.2.0-nfsd-41vers.patch
+Patch101: nfs-utils-1.2.0-permerrors.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -73,7 +74,10 @@ This package also contains the mount.nfs
 %patch01 -p1
 %patch02 -p1
 
+# 513496 - Upgrading nfs-utils on NFSv4 server kills downstream NFSv4 clients
 %patch100 -p1
+# 521638 - Bogus error when mounting stopped server
+%patch101 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -240,6 +244,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Wed Sep  9 2009 <steved at redhat.com> 1.2.0-5
+- Fixed incorrect error given when server is down (bz 521638)
+
 * Mon Jul 27 2009 <steved at redhat.com> 1.2.0-4
 - Fixed 4.1 versioning problem (bz 513496)