Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/fs/ext3/file.c b/fs/ext3/file.c
index 881f6365c41a329724b0a93fec4028eebec66d29..acc4913d30199079007726e8c4a49b4a07dd77cc 100644 (file)
--- a/fs/ext3/file.c
+++ b/fs/ext3/file.c
@@ -120,12 +120,11 @@ const struct file_operations ext3_file_operations = {
        .open           = generic_file_open,
        .release        = ext3_release_file,
        .fsync          = ext3_sync_file,
-       .sendfile       = generic_file_sendfile,
        .splice_read    = generic_file_splice_read,
        .splice_write   = generic_file_splice_write,
 };
 
-struct inode_operations ext3_file_inode_operations = {
+const struct inode_operations ext3_file_inode_operations = {
        .truncate       = ext3_truncate,
        .setattr        = ext3_setattr,
 #ifdef CONFIG_EXT3_FS_XATTR