rpms/kernel/F-12 linux-2.6-nfs4-callback-hidden.patch, NONE, 1.1 kernel.spec, 1.1866, 1.1867

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9043

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-nfs4-callback-hidden.patch 
Log Message:
Fixed hang during NFS installs (bz 528537)


linux-2.6-nfs4-callback-hidden.patch:
 callback_xdr.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE linux-2.6-nfs4-callback-hidden.patch ---
Author: Steve Dickson <steved at redhat.com>
Date: Tue Oct 13 15:59:57 EDT 2009

To avoid hangs in the svc_unregister(), on version 4 mounts 
(and unmounts), when rpcbind is not running, make the nfs4 callback 
program an 'hidden' service by setting the 'vs_hidden' flag in the 
nfs4_callback_version structure. 

Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up linux-2.6.31.x86_64/fs/nfs/callback_xdr.c.orig linux-2.6.31.x86_64/fs/nfs/callback_xdr.c
--- linux-2.6.31.x86_64/fs/nfs/callback_xdr.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.x86_64/fs/nfs/callback_xdr.c	2009-10-13 15:40:19.000000000 -0400
@@ -716,5 +716,6 @@ struct svc_version nfs4_callback_version
 	.vs_proc = nfs4_callback_procedures1,
 	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,
 	.vs_dispatch = NULL,
+	.vs_hidden = 1,
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1866
retrieving revision 1.1867
diff -u -p -r1.1866 -r1.1867
--- kernel.spec	13 Oct 2009 09:38:39 -0000	1.1866
+++ kernel.spec	13 Oct 2009 22:46:52 -0000	1.1867
@@ -720,6 +720,7 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
 Patch3060: linux-2.6-nfs4-ver4opt.patch
+Patch3061: linux-2.6-nfs4-callback-hidden.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1228,6 +1229,7 @@ ApplyPatch linux-2.6-execshield.patch
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
 ApplyPatch linux-2.6-nfs4-ver4opt.patch
+ApplyPatch linux-2.6-nfs4-callback-hidden.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -2059,6 +2061,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 13 2009 Steve Dickson <steved at redhat.com> 2.6.31.4-81
+- Fixed hang during NFS installs (bz 528537)
+
 * Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-80
 - Disable 64-bit DMA on SB600 SATA controllers.