USB: usbmon: fix bug in mon_buff_area_shrink

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

diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index 312fd3f..73655c6 100644 (file)
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -24,7 +24,9 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
+
+#include "ufs_fs.h"
+#include "ufs.h"
 
 /*
  * We have mostly NULL's here: the current defaults are ok for
@@ -33,13 +35,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          = simple_fsync,
+       .splice_read    = generic_file_splice_read,
 };