Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

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

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 3bbc24b587858b97f6ebb0b492b65091158b77c2..1a81cd66d63b2b2371e4c35025f004657ca66adf 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -120,12 +120,11 @@ const struct file_operations ext4_file_operations = {
        .open           = generic_file_open,
        .release        = ext4_release_file,
        .fsync          = ext4_sync_file,
-       .sendfile       = generic_file_sendfile,
        .splice_read    = generic_file_splice_read,
        .splice_write   = generic_file_splice_write,
 };
 
-struct inode_operations ext4_file_inode_operations = {
+const struct inode_operations ext4_file_inode_operations = {
        .truncate       = ext4_truncate,
        .setattr        = ext4_setattr,
 #ifdef CONFIG_EXT4DEV_FS_XATTR
@@ -135,5 +134,6 @@ struct inode_operations ext4_file_inode_operations = {
        .removexattr    = generic_removexattr,
 #endif
        .permission     = ext4_permission,
+       .fallocate      = ext4_fallocate,
 };