Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

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

diff --git a/fs/afs/file.c b/fs/afs/file.c
index aede7eb66dd4f970a74021b41487a5a0a70c0616..a3901769a96c4231b3b6c0cf88b9d3e6746f7468 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -34,6 +34,8 @@ const struct file_operations afs_file_operations = {
        .mmap           = generic_file_readonly_mmap,
        .splice_read    = generic_file_splice_read,
        .fsync          = afs_fsync,
+       .lock           = afs_lock,
+       .flock          = afs_flock,
 };
 
 const struct inode_operations afs_file_inode_operations = {
@@ -48,8 +50,8 @@ const struct address_space_operations afs_fs_aops = {
        .launder_page   = afs_launder_page,
        .releasepage    = afs_releasepage,
        .invalidatepage = afs_invalidatepage,
-       .prepare_write  = afs_prepare_write,
-       .commit_write   = afs_commit_write,
+       .write_begin    = afs_write_begin,
+       .write_end      = afs_write_end,
        .writepage      = afs_writepage,
        .writepages     = afs_writepages,
 };