rpms/kernel/devel linux-2.6-nfs-eio.patch, NONE, 1.1 kernel-2.6.spec, 1.2613, 1.2614

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-nfs-eio.patch 
Log Message:
* Sun Sep  3 2006 Dave Jones <davej at redhat.com>
- Fix bogus -EIO's over NFS (#204859)


linux-2.6-nfs-eio.patch:
 read.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-nfs-eio.patch ---
--- linux-2.6.17.i686/fs/nfs/read.c.orig	2006-09-02 08:23:13.000000000 -0400
+++ linux-2.6.17.i686/fs/nfs/read.c	2006-09-02 17:04:04.000000000 -0400
@@ -500,11 +500,10 @@ static void nfs_readpage_set_pages_uptod
 	pages = &data->args.pages[base >> PAGE_CACHE_SHIFT];
 	base &= ~PAGE_CACHE_MASK;
 	count += base;
-	if (count == 0)
+	for (;count >= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)
+		SetPageUptodate(*pages);
+	if (count != 0)
 		SetPageUptodate(*pages);
-	else
-		for (;count >= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)
-			SetPageUptodate(*pages);
 }
 
 static void nfs_readpage_set_pages_error(struct nfs_read_data *data)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2613
retrieving revision 1.2614
diff -u -r1.2613 -r1.2614
--- kernel-2.6.spec	3 Sep 2006 16:21:09 -0000	1.2613
+++ kernel-2.6.spec	3 Sep 2006 18:57:20 -0000	1.2614
@@ -405,6 +405,7 @@
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1203: linux-2.6-NFSD-badness.patch
 Patch1204: linux-2.6-nfs-special-tests-fix.patch
+Patch1205: linux-2.6-nfs-eio.patch
 
 # core networking changes.
 Patch1300: linux-2.6-net-ipsec-labelling.patch
@@ -949,6 +950,8 @@
 %patch1203 -p1
 # Fix nfs special tests problem
 %patch1204 -p1
+# Fix bogus EIO over NFS
+%patch1205 -p1
 
 # core networking changes.
 %patch1300 -p1
@@ -1825,6 +1828,9 @@
 %endif
 
 %changelog
+* Sun Sep  3 2006 Dave Jones <davej at redhat.com>
+- Fix bogus -EIO's over NFS (#204859)
+
 * Sun Sep  3 2006 Marcelo Tosatti <mtosatti at redhat.com>
 - Remove PAE, xen and kdump configs for olpc case