rpms/kernel/FC-4 linux-2.6-compile-fixes.patch,1.8,1.9

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
more fixing :-/


linux-2.6-compile-fixes.patch:
 fs/nfs/direct.c       |   35 +++++++++++++++++------------------
 include/linux/types.h |    1 +
 2 files changed, 18 insertions(+), 18 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-compile-fixes.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-compile-fixes.patch	2 Mar 2006 04:06:50 -0000	1.8
+++ linux-2.6-compile-fixes.patch	2 Mar 2006 04:33:46 -0000	1.9
@@ -8,3 +8,55 @@
  #endif
  
  #include <linux/posix_types.h>
+
+--- linux-2.6.15/fs/nfs/direct.c~	2006-03-01 23:31:37.000000000 -0500
++++ linux-2.6.15/fs/nfs/direct.c	2006-03-01 23:32:01.000000000 -0500
+@@ -73,6 +73,23 @@ struct nfs_direct_req {
+ 				error;		/* any reported error */
+ };
+ 
++/**
++ * nfs_free_user_pages - tear down page struct array
++ * @pages: array of page struct pointers underlying target buffer
++ * @npages: number of pages in the array
++ * @do_dirty: dirty the pages as we release them
++ */
++static void
++nfs_free_user_pages(struct page **pages, int npages, int do_dirty)
++{
++	int i;
++	for (i = 0; i < npages; i++) {
++		if (do_dirty)
++			set_page_dirty_lock(pages[i]);
++		page_cache_release(pages[i]);
++	}
++	kfree(pages);
++}
+ 
+ /**
+  * nfs_get_user_pages - find and set up pages underlying user's buffer
+@@ -117,24 +134,6 @@ nfs_get_user_pages(int rw, unsigned long
+ }
+ 
+ /**
+- * nfs_free_user_pages - tear down page struct array
+- * @pages: array of page struct pointers underlying target buffer
+- * @npages: number of pages in the array
+- * @do_dirty: dirty the pages as we release them
+- */
+-static void
+-nfs_free_user_pages(struct page **pages, int npages, int do_dirty)
+-{
+-	int i;
+-	for (i = 0; i < npages; i++) {
+-		if (do_dirty)
+-			set_page_dirty_lock(pages[i]);
+-		page_cache_release(pages[i]);
+-	}
+-	kfree(pages);
+-}
+-
+-/**
+  * nfs_direct_req_release - release  nfs_direct_req structure for direct read
+  * @kref: kref object embedded in an nfs_direct_req structure
+  *