const: struct quota_format_ops

[safe/jmp/linux-2.6] / fs / ufs / file.c

diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index a9c6e5f..73655c6 100644 (file)
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -24,27 +24,9 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
-#include <linux/buffer_head.h> /* for sync_mapping_buffers() */
-
-static int ufs_sync_file(struct file *file, struct dentry *dentry, int datasync)
-{
-       struct inode *inode = dentry->d_inode;
-       int err;
-       int ret;
-
-       ret = sync_mapping_buffers(inode->i_mapping);
-       if (!(inode->i_state & I_DIRTY))
-               return ret;
-       if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
-               return ret;
-
-       err = ufs_sync_inode(inode);
-       if (ret == 0)
-               ret = err;
-       return ret;
-}
 
+#include "ufs_fs.h"
+#include "ufs.h"
 
 /*
  * We have mostly NULL's here: the current defaults are ok for
@@ -53,10 +35,12 @@ static int ufs_sync_file(struct file *file, struct dentry *dentry, int datasync)
  
 const struct file_operations ufs_file_operations = {
        .llseek         = generic_file_llseek,
-       .read           = generic_file_read,
-       .write          = generic_file_write,
+       .read           = do_sync_read,
+       .aio_read       = generic_file_aio_read,
+       .write          = do_sync_write,
+       .aio_write      = generic_file_aio_write,
        .mmap           = generic_file_mmap,
        .open           = generic_file_open,
-       .fsync          = ufs_sync_file,
-       .sendfile       = generic_file_sendfile,
+       .fsync          = simple_fsync,
+       .splice_read    = generic_file_splice_read,
 };