aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2010-11-29 09:49:11 -0500
committerChris Mason <chris.mason@oracle.com>2010-11-29 09:49:11 -0500
commit5a92bc88cef279261d3f138e25850c122df67045 (patch)
tree22bc186bda2d2a61343bed473c3e606b43a49a18 /fs/btrfs
parent163cf09c2a0ee5cac6285f9347975bd1e97725da (diff)
downloadkernel_samsung_tuna-5a92bc88cef279261d3f138e25850c122df67045.zip
kernel_samsung_tuna-5a92bc88cef279261d3f138e25850c122df67045.tar.gz
kernel_samsung_tuna-5a92bc88cef279261d3f138e25850c122df67045.tar.bz2
Btrfs: don't use migrate page without CONFIG_MIGRATION
Fixes compile error Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/disk-io.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 57c9d8e..33b6d45 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -712,8 +712,11 @@ static int btree_migratepage(struct address_space *mapping,
if (page_has_private(page) &&
!try_to_release_page(page, GFP_KERNEL))
return -EAGAIN;
-
+#ifdef CONFIG_MIGRATION
return migrate_page(mapping, newpage, page);
+#else
+ return -ENOSYS;
+#endif
}
static int btree_writepage(struct page *page, struct writeback_control *wbc)
@@ -821,7 +824,9 @@ static const struct address_space_operations btree_aops = {
.releasepage = btree_releasepage,
.invalidatepage = btree_invalidatepage,
.sync_page = block_sync_page,
+#ifdef CONFIG_MIGRATION
.migratepage = btree_migratepage,
+#endif
};
int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,