linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / ufs / file.c

diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index a9c6e5f..ed69d7f 100644 (file)
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -23,40 +23,33 @@
  *  ext2 fs regular file handling primitives
  */
 
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+#include <linux/errno.h>
 #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 <linux/fcntl.h>
+#include <linux/time.h>
+#include <linux/stat.h>
+#include <linux/mm.h>
+#include <linux/pagemap.h>
+#include <linux/smp_lock.h>
 
 /*
  * We have mostly NULL's here: the current defaults are ok for
  * the ufs filesystem.
  */
  
-const struct file_operations ufs_file_operations = {
+struct file_operations ufs_file_operations = {
        .llseek         = generic_file_llseek,
        .read           = generic_file_read,
        .write          = generic_file_write,
        .mmap           = generic_file_mmap,
        .open           = generic_file_open,
-       .fsync          = ufs_sync_file,
        .sendfile       = generic_file_sendfile,
 };
+
+struct inode_operations ufs_file_inode_operations = {
+       .truncate       = ufs_truncate,
+};