Pull randconfig into release branch

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

diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index 312fd3f86313b61a7d6f7230699cc2f763d69008..6705d74c6d2d9b836dcdd3d3be1d40b65b3bf8e1 100644 (file)
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -25,6 +25,26 @@
 
 #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;
+}
+
 
 /*
  * We have mostly NULL's here: the current defaults are ok for
@@ -33,13 +53,12 @@
  
 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,
-       .sendfile       = generic_file_sendfile,
-};
-
-struct inode_operations ufs_file_inode_operations = {
-       .truncate       = ufs_truncate,
+       .fsync          = ufs_sync_file,
+       .splice_read    = generic_file_splice_read,
 };