rpms/kernel/devel kernel-2.6.spec, 1.1578, 1.1579 linux-2.6.13-knfsd-ctlbits.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7655

Modified Files:
	kernel-2.6.spec linux-2.6.13-knfsd-ctlbits.patch 
Log Message:
knfsd patch, take 2.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1578
retrieving revision 1.1579
diff -u -r1.1578 -r1.1579
--- kernel-2.6.spec	26 Sep 2005 22:08:21 -0000	1.1578
+++ kernel-2.6.spec	27 Sep 2005 20:30:43 -0000	1.1579
@@ -1248,6 +1248,9 @@
 %endif
 
 %changelog
+* Tue Sep 27 2005 Dave Jones <davej at redhat.com>
+- Fix typo in previous knfsd patch.
+
 * Mon Sep 26 2005 Dave Jones <davej at redhat.com>
 - 2.6.14-rc2-git6
 

linux-2.6.13-knfsd-ctlbits.patch:
 fs/nfsd/nfs4state.c          |    3 +
 fs/nfsd/nfsctl.c             |  113 +++++++++++++++++++++++++++++++++++++++++--
 fs/nfsd/nfssvc.c             |   82 ++++++++++++++++++++-----------
 include/linux/nfsd/syscall.h |   19 +++++++
 4 files changed, 186 insertions(+), 31 deletions(-)

Index: linux-2.6.13-knfsd-ctlbits.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.13-knfsd-ctlbits.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.13-knfsd-ctlbits.patch	24 Sep 2005 19:19:01 -0000	1.1
+++ linux-2.6.13-knfsd-ctlbits.patch	27 Sep 2005 20:30:56 -0000	1.2
@@ -195,7 +195,7 @@
  	};
  	return simple_fill_super(sb, 0x6e667364, nfsd_files);
 --- linux-2.6.13/fs/nfsd/nfssvc.c.ctlbits	2005-08-28 19:41:01.000000000 -0400
-+++ linux-2.6.13/fs/nfsd/nfssvc.c	2005-09-24 05:13:42.354795000 -0400
++++ linux-2.6.13/fs/nfsd/nfssvc.c	2005-09-27 09:04:40.273630000 -0400
 @@ -30,6 +30,7 @@
  #include <linux/nfsd/nfsd.h>
  #include <linux/nfsd/stats.h>
@@ -278,31 +278,22 @@
  	/* Readahead param cache - will no-op if it already exists */
  	error =	nfsd_racache_init(2*nrservs);
  	if (error<0)
-@@ -104,14 +152,17 @@ nfsd_svc(unsigned short port, int nrserv
+@@ -104,11 +152,14 @@ nfsd_svc(unsigned short port, int nrserv
  		nfsd_serv = svc_create(&nfsd_program, NFSD_BUFSIZE);
  		if (nfsd_serv == NULL)
  			goto out;
--		error = svc_makesock(nfsd_serv, IPPROTO_UDP, port);
--		if (error < 0)
--			goto failure;
++		if (NFSCTL_UDPISSET(nfsd_portbits))
++			port = nfsd_port;
+ 		error = svc_makesock(nfsd_serv, IPPROTO_UDP, port);
+ 		if (error < 0)
+ 			goto failure;
 -
-+		if (!nfsd_portbits || NFSCTL_UDPISSET(nfsd_portbits)) {
-+			error = svc_makesock(nfsd_serv, IPPROTO_UDP, port);
-+			if (error < 0)
-+				goto failure;
-+		}
  #ifdef CONFIG_NFSD_TCP
--		error = svc_makesock(nfsd_serv, IPPROTO_TCP, port);
--		if (error < 0)
--			goto failure;
-+		if (!nfsd_portbits || NFSCTL_TCPISSET(nfsd_portbits)) {
-+			error = svc_makesock(nfsd_serv, IPPROTO_TCP, port);
-+			if (error < 0)
-+				goto failure;
-+		}
- #endif
- 		do_gettimeofday(&nfssvc_boot);		/* record boot time */
- 	} else
++		if (NFSCTL_TCPISSET(nfsd_portbits))
++			port = nfsd_port;
+ 		error = svc_makesock(nfsd_serv, IPPROTO_TCP, port);
+ 		if (error < 0)
+ 			goto failure;
 @@ -389,28 +440,3 @@ static struct svc_stat	nfsd_acl_svcstats
  #else
  #define nfsd_acl_program_p	NULL