Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / fs / bfs / file.c

diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 3d5aca28a0a0980922c83c0b197d1cf52cb27593..24310e9ee05ad343245c0d9e881f150006c8e69f 100644 (file)
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -19,10 +19,12 @@
 
 const struct file_operations bfs_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,
-       .sendfile       = generic_file_sendfile,
+       .splice_read    = generic_file_splice_read,
 };
 
 static int bfs_move_block(unsigned long from, unsigned long to, struct super_block *sb)
@@ -162,4 +164,4 @@ const struct address_space_operations bfs_aops = {
        .bmap           = bfs_bmap,
 };
 
-struct inode_operations bfs_file_inops;
+const struct inode_operations bfs_file_inops;