diff options
author | Jan Beulich <jbeulich@novell.com> | 2010-12-07 17:54:09 +0300 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2010-12-11 00:29:11 +0300 |
commit | 3dd1462e82bcab7625cec129952f26dae7a8b742 (patch) | |
tree | 0e4da87e5de3c71613ab6a6470b5c16d03c793a4 /fs/btrfs/disk-io.c | |
parent | fdfb1e4f6c61477a61890b64974d65cdc3a98702 (diff) | |
download | linux-3dd1462e82bcab7625cec129952f26dae7a8b742.tar.xz |
Btrfs: fix compiler warnings
... regarding an unused function when !MIGRATION, and regarding a
printk() format string vs argument mismatch.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 33b6d459494c..b803c2667673 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -696,6 +696,7 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, __btree_submit_bio_done); } +#ifdef CONFIG_MIGRATION static int btree_migratepage(struct address_space *mapping, struct page *newpage, struct page *page) { @@ -712,12 +713,9 @@ 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 } +#endif static int btree_writepage(struct page *page, struct writeback_control *wbc) { |