[Ocfs2-commits] manish commits r1042 - trunk/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-09 21:37:45 -0500 (Wed, 09 Jun 2004)
New Revision: 1042

Modified:
   trunk/src/inode.c
Log:
Fix direct_IO prototypes for 2.6


Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-06-10 02:34:13 UTC (rev 1041)
+++ trunk/src/inode.c	2004-06-10 02:37:45 UTC (rev 1042)
@@ -53,7 +53,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 static sector_t ocfs_bmap(struct address_space *mapping, sector_t block);
 static int ocfs_writepage (struct page *page, struct writeback_control *wbc);
-static int ocfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t offset, unsigned long nr_segs);
+static ssize_t ocfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t offset, unsigned long nr_segs);
 static int ocfs_init_locked_inode(struct inode * inode, void * opaque);
 static int ocfs_find_actor (struct inode *inode, void *opaque);
 static void ocfs_read_locked_inode (struct inode *inode, ocfs_find_inode_args *args);
@@ -1262,7 +1262,7 @@
  * int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
  *                  loff_t offset, unsigned long nr_segs);
  */
-static int ocfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t offset, unsigned long nr_segs)
+static ssize_t ocfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t offset, unsigned long nr_segs)
 {
 	struct file *file = iocb->ki_filp;
 	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;