Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

[sfrench/cifs-2.6.git] / fs / qnx4 / file.c

diff --git a/fs/qnx4/file.c b/fs/qnx4/file.c
index c33963fded9eb94d0b209c48e60d7c7499a27a20..44649981bbc8b08b7c1830d903432bb3fb583701 100644 (file)
--- a/fs/qnx4/file.c
+++ b/fs/qnx4/file.c
@@ -19,19 +19,21 @@
  * We have mostly NULL's here: the current defaults are ok for
  * the qnx4 filesystem.
  */
-struct file_operations qnx4_file_operations =
+const struct file_operations qnx4_file_operations =
 {
        .llseek         = generic_file_llseek,
-       .read           = generic_file_read,
+       .read           = do_sync_read,
+       .aio_read       = generic_file_aio_read,
        .mmap           = generic_file_mmap,
        .sendfile       = generic_file_sendfile,
 #ifdef CONFIG_QNX4FS_RW
-       .write          = generic_file_write,
+       .write          = do_sync_write,
+       .aio_write      = generic_file_aio_write,
        .fsync          = qnx4_sync_file,
 #endif
 };
 
-struct inode_operations qnx4_file_inode_operations =
+const struct inode_operations qnx4_file_inode_operations =
 {
 #ifdef CONFIG_QNX4FS_RW
        .truncate       = qnx4_truncate,