Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

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

diff --git a/fs/adfs/file.c b/fs/adfs/file.c
index 6af10885f9d6d0449a8e6836eedbbede5794ff6b..6101ea679cb1bf7772ba5da5342d7fb6def023ee 100644 (file)
--- a/fs/adfs/file.c
+++ b/fs/adfs/file.c
@@ -25,12 +25,14 @@
 
 #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,
+       .write          = do_sync_write,
+       .aio_write      = generic_file_aio_write,
        .sendfile       = generic_file_sendfile,
 };