rpms/util-linux/FC-5 util-linux-2.13-nfsmount-retry.patch, 1.1, 1.2 util-linux.spec, 1.115, 1.116

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/util-linux/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15711

Modified Files:
	util-linux-2.13-nfsmount-retry.patch util-linux.spec 
Log Message:
Fixed bug in patch for bz183713 which cause nfs4 mounts to fail.


util-linux-2.13-nfsmount-retry.patch:
 nfs.5       |    8 ++-
 nfs4mount.c |   40 ++++++++++++----
 nfsmount.c  |  149 +++++++++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 140 insertions(+), 57 deletions(-)

Index: util-linux-2.13-nfsmount-retry.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-5/util-linux-2.13-nfsmount-retry.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.13-nfsmount-retry.patch	2 May 2006 12:03:27 -0000	1.1
+++ util-linux-2.13-nfsmount-retry.patch	24 May 2006 18:55:27 -0000	1.2
@@ -1,5 +1,5 @@
---- util-linux-2.13-pre6/mount/nfsmount.c.retry	2006-05-01 13:05:16.000000000 -0400
-+++ util-linux-2.13-pre6/mount/nfsmount.c	2006-05-01 13:19:01.000000000 -0400
+--- util-linux-2.13-pre7/mount/nfsmount.c.retry	2006-05-24 14:32:24.455600000 -0400
++++ util-linux-2.13-pre7/mount/nfsmount.c	2006-05-24 14:46:33.425825000 -0400
 @@ -125,9 +125,30 @@ void rpc_strerror()
  		if ((ptr = index(estr, ':')))
  			estr = ++ptr;
@@ -302,8 +302,8 @@
  	if (!clnt)
  		goto out_bad;
  	switch (mnt_server->pmap.pm_vers) {
---- util-linux-2.13-pre6/mount/nfs4mount.c.retry	2006-05-01 13:05:14.000000000 -0400
-+++ util-linux-2.13-pre6/mount/nfs4mount.c	2006-05-01 13:08:10.000000000 -0400
+--- util-linux-2.13-pre7/mount/nfs4mount.c.retry	2006-05-24 14:32:23.725599000 -0400
++++ util-linux-2.13-pre7/mount/nfs4mount.c	2006-05-24 14:47:24.187074000 -0400
 @@ -77,7 +77,7 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
  #endif
  
@@ -321,7 +321,7 @@
  
  	retval = EX_FAIL;
  	if (strlen(spec) >= sizeof(hostdir)) {
-@@ -413,12 +414,33 @@ int nfs4mount(const char *spec, const ch
+@@ -413,12 +414,36 @@ int nfs4mount(const char *spec, const ch
  	printf("proto = %s\n", (data.proto == IPPROTO_TCP) ? "tcp" : "udp");
  #endif
  
@@ -340,6 +340,9 @@
 +				ntohs(server_addr.sin_port));
 +		}
 +		clnt_ping(&server_addr, NFS_PROGRAM, 4, data.proto);
++		if (rpc_createerr.cf_stat == RPC_SUCCESS)
++			break;
++
 +		switch(rpc_createerr.cf_stat){
 +		case RPC_TIMEDOUT:
 +			break;
@@ -360,7 +363,7 @@
  	}
  
  	*mount_opts = (char *) &data;
-@@ -426,8 +448,5 @@ int nfs4mount(const char *spec, const ch
+@@ -426,8 +451,5 @@ int nfs4mount(const char *spec, const ch
  	return 0;
  
  fail:
@@ -369,8 +372,8 @@
 -	}
  	return retval;
  }
---- util-linux-2.13-pre6/mount/nfs.5.retry	2006-05-01 13:05:16.000000000 -0400
-+++ util-linux-2.13-pre6/mount/nfs.5	2006-05-01 13:08:10.000000000 -0400
+--- util-linux-2.13-pre7/mount/nfs.5.retry	2006-05-24 14:32:24.416600000 -0400
++++ util-linux-2.13-pre7/mount/nfs.5	2006-05-24 14:46:33.448824000 -0400
 @@ -134,7 +134,9 @@ There is no default value.
  .I retry=n
  The number of minutes to retry an NFS mount operation


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-5/util-linux.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- util-linux.spec	2 May 2006 12:03:27 -0000	1.115
+++ util-linux.spec	24 May 2006 18:55:27 -0000	1.116
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.20.3
+Release: 0.20.4
 License: distributable
 Group: System Environment/Base
 
@@ -672,6 +672,9 @@
 /sbin/losetup
 
 %changelog
+* Wed May 24 2006 Steve Dickson <steved at redhat.com> 2.13-0.20.4
+- Fixed bug in patch for bz183713 which cause nfs4 mounts to fail.
+
 * Tue May  2 2006 Steve Dickson <steved at redhat.com> 2.13-0.20.3
 - Added syslog logging to background mounts as suggested
   by a customer.