Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs

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

diff --git a/fs/adfs/file.c b/fs/adfs/file.c
index 6af1088..005ea34 100644 (file)
--- a/fs/adfs/file.c
+++ b/fs/adfs/file.c
@@ -19,21 +19,19 @@
  *
  *  adfs regular file handling primitives           
  */
-#include <linux/fs.h>
-#include <linux/buffer_head.h>                 /* for file_fsync() */
-#include <linux/adfs_fs.h>
-
 #include "adfs.h"
 
-struct file_operations adfs_file_operations = {
+const struct file_operations adfs_file_operations = {
        .llseek         = generic_file_llseek,
-       .read           = generic_file_read,
+       .read           = do_sync_read,
+       .aio_read       = generic_file_aio_read,
        .mmap           = generic_file_mmap,
-       .fsync          = file_fsync,
-       .write          = generic_file_write,
-       .sendfile       = generic_file_sendfile,
+       .fsync          = simple_fsync,
+       .write          = do_sync_write,
+       .aio_write      = generic_file_aio_write,
+       .splice_read    = generic_file_splice_read,
 };
 
-struct inode_operations adfs_file_inode_operations = {
+const struct inode_operations adfs_file_inode_operations = {
        .setattr        = adfs_notify_change,
 };