[Ocfs2-commits] mfasheh commits r1399 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-08-30 12:40:48 -0500 (Mon, 30 Aug 2004)
New Revision: 1399

Modified:
   trunk/src/file.c
Log:
* fix ocfs_file_write for 2.6.



Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c	2004-08-28 18:40:45 UTC (rev 1398)
+++ trunk/src/file.c	2004-08-30 17:40:48 UTC (rev 1399)
@@ -33,6 +33,7 @@
 #include <linux/slab.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
+#include <linux/uio.h>
 
 #include "ocfs_log.h"
 #include "ocfs.h"
@@ -711,6 +712,8 @@
 	 * address_space_operations struct
 	 */
 	{
+		struct iovec local_iov = { .iov_base = (void __user *)buf, 
+					   .iov_len = count };
 		/* ick.  seems to be our only way of toggling 
 		 * directio for 2.6 */
 		unsigned int savedflags = filp->f_flags;
@@ -718,7 +721,7 @@
 			filp->f_flags |= O_DIRECT;
 		else
 			filp->f_flags &= ~O_DIRECT;
-		ret = generic_file_write_nolock (filp, buf, count, ppos);
+		ret = generic_file_write_nolock (filp, &local_iov, 1, ppos);
 		filp->f_flags = savedflags;
 	}
 #else