Merge branch 'linus' into core/softlockup

[linux.git] / fs / afs / file.c

diff --git a/fs/afs/file.c b/fs/afs/file.c
index 9c0e721d9fc219fff078507b879b92b7ae41b1fb..525f7c56e068d877e95dedea3a15dafc116fdb41 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -32,8 +32,10 @@ const struct file_operations afs_file_operations = {
        .aio_read       = generic_file_aio_read,
        .aio_write      = afs_file_write,
        .mmap           = generic_file_readonly_mmap,
-       .sendfile       = generic_file_sendfile,
+       .splice_read    = generic_file_splice_read,
        .fsync          = afs_fsync,
+       .lock           = afs_lock,
+       .flock          = afs_flock,
 };
 
 const struct inode_operations afs_file_inode_operations = {