rpms/util-linux/devel util-linux-2.13-nfsmount-retry.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: steved

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

Modified Files:
	util-linux-2.13-nfsmount-retry.patch 
Log Message:
Fixed typo


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

Index: util-linux-2.13-nfsmount-retry.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/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	1 May 2006 15:12:03 -0000	1.1
+++ util-linux-2.13-nfsmount-retry.patch	1 May 2006 15:59:13 -0000	1.2
@@ -1,5 +1,5 @@
---- util-linux-2.13-pre6/mount/nfsmount.c.retry	2006-05-01 10:55:38.000000000 -0400
-+++ util-linux-2.13-pre6/mount/nfsmount.c	2006-05-01 11:01:05.000000000 -0400
+--- util-linux-2.13-pre6/mount/nfsmount.c.retry	2006-05-01 11:53:20.000000000 -0400
++++ util-linux-2.13-pre6/mount/nfsmount.c	2006-05-01 11:56:34.000000000 -0400
 @@ -125,9 +125,30 @@ void rpc_strerror()
  		if ((ptr = index(estr, ':')))
  			estr = ++ptr;
@@ -293,14 +293,14 @@
  	if (!clnt)
  		goto out_bad;
  	switch (mnt_server->pmap.pm_vers) {
---- util-linux-2.13-pre6/mount/nfs4mount.c.retry	2006-05-01 10:55:36.000000000 -0400
-+++ util-linux-2.13-pre6/mount/nfs4mount.c	2006-05-01 10:59:49.000000000 -0400
+--- util-linux-2.13-pre6/mount/nfs4mount.c.retry	2006-05-01 11:53:18.000000000 -0400
++++ util-linux-2.13-pre6/mount/nfs4mount.c	2006-05-01 11:56:55.000000000 -0400
 @@ -77,7 +77,7 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
  #endif
  
  extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
 -extern void rpc_strerror();
-+extern void mount_errors(char *, int);
++extern void mount_errors(char *, int, int);
  
  struct {
  	char    *flavour;
@@ -338,15 +338,15 @@
 +			if (errno == ETIMEDOUT)
 +				break;
 +		default:
-+			mount_errors(hostname, 0);
++			mount_errors(hostname, 0, bg);
 +			goto fail;
 +		}
 +		t = time(NULL);
 +		if (t >= timeout) {
-+			mount_errors(hostname, 0);
++			mount_errors(hostname, 0, bg);
 +			goto fail;
 +		}
-+		mount_errors(hostname, 1);
++		mount_errors(hostname, 1, bg);
 +		continue;
  	}
  
@@ -360,8 +360,8 @@
 -	}
  	return retval;
  }
---- util-linux-2.13-pre6/mount/nfs.5.retry	2006-05-01 10:55:38.000000000 -0400
-+++ util-linux-2.13-pre6/mount/nfs.5	2006-05-01 10:59:49.000000000 -0400
+--- util-linux-2.13-pre6/mount/nfs.5.retry	2006-05-01 11:53:20.000000000 -0400
++++ util-linux-2.13-pre6/mount/nfs.5	2006-05-01 11:56:34.000000000 -0400
 @@ -134,7 +134,9 @@ There is no default value.
  .I retry=n
  The number of minutes to retry an NFS mount operation