mm: merge populate and nopage into fault (fixes nonlinear)

[pandora-kernel.git] / fs / afs / file.c

diff --git a/fs/afs/file.c b/fs/afs/file.c
index 3e25795..525f7c5 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 = {
@@ -236,7 +238,7 @@ static void afs_invalidatepage(struct page *page, unsigned long offset)
 {
        int ret = 1;
 
-       kenter("{%lu},%lu", page->index, offset);
+       _enter("{%lu},%lu", page->index, offset);
 
        BUG_ON(!PageLocked(page));