X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fhfs%2Finode.c;h=bc835f272a6e0a9e017aac7517e672a4ea0db5bb;hb=20c2df83d25c6a95affe6157a4c9cac4cf5ffaac;hp=5cb7f8fee8d6501d53e8a1931a07feafb502f8c6;hpb=9b3a89f8b052f2a6193a9691e053f986144a65a0;p=linux-2.6

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 5cb7f8fee8..bc835f272a 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -13,12 +13,13 @@
 
 #include <linux/pagemap.h>
 #include <linux/mpage.h>
+#include <linux/sched.h>
 
 #include "hfs_fs.h"
 #include "btree.h"
 
 static const struct file_operations hfs_file_operations;
-static struct inode_operations hfs_file_inode_operations;
+static const struct inode_operations hfs_file_inode_operations;
 
 /*================ Variable-like macros ================*/
 
@@ -606,13 +607,13 @@ static const struct file_operations hfs_file_operations = {
 	.write		= do_sync_write,
 	.aio_write	= generic_file_aio_write,
 	.mmap		= generic_file_mmap,
-	.sendfile	= generic_file_sendfile,
+	.splice_read	= generic_file_splice_read,
 	.fsync		= file_fsync,
 	.open		= hfs_file_open,
 	.release	= hfs_file_release,
 };
 
-static struct inode_operations hfs_file_inode_operations = {
+static const struct inode_operations hfs_file_inode_operations = {
 	.lookup		= hfs_file_lookup,
 	.truncate	= hfs_file_truncate,
 	.setattr	= hfs_inode_setattr,