rpms/kernel/FC-4 linux-2.6-NFSD-badness.patch, NONE, 1.1 kernel-2.6.spec, 1.1509, 1.1510

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-NFSD-badness.patch 
Log Message:
More NFS fixing


linux-2.6-NFSD-badness.patch:
 arch/x86_64/mm/init.c |   12 ++++++++++++
 fs/lockd/svc.c        |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-NFSD-badness.patch ---
--- linux-2.6.14/arch/x86_64/mm/init.c~	2005-11-22 10:11:34.000000000 -0500
+++ linux-2.6.14/arch/x86_64/mm/init.c	2005-11-22 10:14:00.000000000 -0500
@@ -576,11 +576,16 @@ void free_initmem(void)
 
 #ifdef CONFIG_DEBUG_RODATA
 
+static int nowprodata;
+
 extern char __start_rodata, __end_rodata;
 void mark_rodata_ro(void)
 {
 	unsigned long addr = (unsigned long)&__start_rodata;
 
+	if (nowprodata == 1)
+		return;
+
 	for (; addr < (unsigned long)&__end_rodata; addr += PAGE_SIZE)
 		change_page_attr_addr(addr, 1, PAGE_KERNEL_RO);
 
@@ -595,6 +600,13 @@ void mark_rodata_ro(void)
 	 */
 	global_flush_tlb();
 }
+
+static int __init disable_rodata(char *str)
+{
+	nowprodata = 1;
+	return 1;
+}
+__setup("nowprodata", disable_rodata);
 #endif
 
 #ifdef CONFIG_BLK_DEV_INITRD
--- linux-2.6.14/fs/lockd/svc.c~	2005-11-22 10:37:03.000000000 -0500
+++ linux-2.6.14/fs/lockd/svc.c	2005-11-22 10:37:38.000000000 -0500
@@ -305,7 +305,7 @@ lockd_down(void)
 	 * the lockd semaphore, we can't wait around forever ...
 	 */
 	clear_thread_flag(TIF_SIGPENDING);
-	interruptible_sleep_on_timeout(&lockd_exit, HZ);
+	wait_event_timeout(lockd_exit, nlmsvc_pid == 0, HZ);
 	if (nlmsvc_pid) {
 		printk(KERN_WARNING 
 			"lockd_down: lockd failed to exit, clearing pid\n");


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1509
retrieving revision 1.1510
diff -u -r1.1509 -r1.1510
--- kernel-2.6.spec	21 Nov 2005 20:17:26 -0000	1.1509
+++ kernel-2.6.spec	22 Nov 2005 15:43:46 -0000	1.1510
@@ -296,6 +296,7 @@
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1202: linux-2.6-NFSD-locking-fix.patch
+Patch1203: linux-2.6-NFSD-badness.patch
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
@@ -701,6 +702,8 @@
 %patch1201 -p1
 # Fix badness in NFSD locking
 %patch1202 -p1
+# more NFS badness
+%patch1203 -p1
 
 # NIC driver fixes.
 # New PCI ID for sundance driver.
@@ -1253,7 +1256,10 @@
 %endif
 
 %changelog
-* Mon Nov 21 2005 Dave Jones <davej at redhat.com> [2.6.14-1.1641_FC4]
+* Tue Nov 22 2005 Dave Jones <davej at redhat.com> [2.6.14-1.1641_FC4]
+- Fix another NFSD badness warning.
+
+* Mon Nov 21 2005 Dave Jones <davej at redhat.com>
 - Remove broken hostname changes in revision field of kernel spec. (#173366)
 - Fix some broken locking in NFSD.