diff options
| author | Chris Mason | 2007-07-25 18:31:35 +0200 |
|---|---|---|
| committer | David Woodhouse | 2007-07-25 18:31:35 +0200 |
| commit | 92fee66d49b812ea57eae53c5baaf8942ac9af06 (patch) | |
| tree | 48668d45038a0d53a647623b2782e35090d1e7ee /fs/btrfs/file.c | |
| parent | Btrfs: Implement mknod (diff) | |
| download | kernel-qcow2-linux-92fee66d49b812ea57eae53c5baaf8942ac9af06.tar.gz kernel-qcow2-linux-92fee66d49b812ea57eae53c5baaf8942ac9af06.tar.xz kernel-qcow2-linux-92fee66d49b812ea57eae53c5baaf8942ac9af06.zip | |
Btrfs: deal with api changes in 2.6.23-rc1
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index f327525f541d..1fe38fe84150 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -30,6 +30,7 @@ #include <linux/writeback.h> #include <linux/statfs.h> #include <linux/compat.h> +#include <linux/version.h> #include "ctree.h" #include "disk-io.h" #include "transaction.h" @@ -713,8 +714,12 @@ out: } static struct vm_operations_struct btrfs_file_vm_ops = { - .nopage = filemap_nopage, - .populate = filemap_populate, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) + .nopage = filemap_nopage, + .populate = filemap_populate, +#else + .fault = filemap_fault, +#endif .page_mkwrite = btrfs_page_mkwrite, }; |