r2688 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Jurij Smakov]

Author: jurij-guest
Date: 2005-03-13 21:12:38 +0100 (Sun, 13 Mar 2005)
New Revision: 2688

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nfs-O_DIRECT-fix.dpatch
Removed:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nfs-O_DIRECT-fix.patch
Log:
Rename nfs-O_DIRECT-fix.patch to .dpatch in
2.6.8 source, since that's how it is referred
to in the series/2.6.8-14.


Copied: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nfs-O_DIRECT-fix.dpatch (from rev 2687, trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nfs-O_DIRECT-fix.patch)

Deleted: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nfs-O_DIRECT-fix.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nfs-O_DIRECT-fix.patch	2005-03-13 15:10:47 UTC (rev 2687)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nfs-O_DIRECT-fix.patch	2005-03-13 20:12:38 UTC (rev 2688)
@@ -1,34 +0,0 @@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2005/01/04 15:57:25-08:00 brugolsky@telemetry-investments.com 
-#   [PATCH] NFS client O_DIRECT error case fix
-#   
-#   The NFS direct-io error return path for request sizes greater than
-#   MAX_DIRECTIO_SIZE fails to initialize the returned page struct array
-#   pointer to NULL.
-#   
-#   Discovered using AKPM's ext3-tools: odwrite -ko 0 16385 foo
-#   
-#   Signed-off-by: Bill Rugolsky <brugolsky@telemetry-investments.com>
-#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-# 
-# fs/nfs/direct.c
-#   2005/01/04 13:55:37-08:00 brugolsky@telemetry-investments.com +3 -1
-#   NFS client O_DIRECT error case fix
-# 
-diff -Nru a/fs/nfs/direct.c b/fs/nfs/direct.c
---- a/fs/nfs/direct.c	2005-01-04 20:03:28 -08:00
-+++ b/fs/nfs/direct.c	2005-01-04 20:03:28 -08:00
-@@ -72,8 +72,10 @@
- 	size_t array_size;
- 
- 	/* set an arbitrary limit to prevent arithmetic overflow */
--	if (size > MAX_DIRECTIO_SIZE)
-+	if (size > MAX_DIRECTIO_SIZE) {
-+		*pages = NULL;
- 		return -EFBIG;
-+	}
- 
- 	page_count = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT;
- 	page_count -= user_addr >> PAGE_SHIFT;