[next-rc] Compile Error fs/btrfs/diskio.c

Commit Message

Mitch Harder Nov. 27, 2010, 10:53 p.m. UTC

None

Patch

--- fs/btrfs/disk-io.c	2010-11-27 15:59:22.896666675 -0600
+++ /usr/src/linux/fs/btrfs/disk-io.c	2010-11-27 16:08:15.643333349 -0600
@@ -696,6 +696,7 @@ 
 				   __btree_submit_bio_done);
 }

+#ifdef CONFIG_MIGRATION
 static int btree_migratepage(struct address_space *mapping,
 			struct page *newpage, struct page *page)
 {
@@ -715,6 +716,9 @@ 

 	return migrate_page(mapping, newpage, page);
 }
+#else
+#define btree_migratepage NULL
+#endif

 static int btree_writepage(struct page *page, struct writeback_control *wbc)
 {