btrfs: avoid compiler warnings

Commit Message

Jan Beulich Dec. 7, 2010, 2:54 p.m. UTC

None

Patch

--- linux-2.6.37-rc5/fs/btrfs/disk-io.c
+++ 2.6.37-rc5-btrfs-warnings/fs/btrfs/disk-io.c
@@ -696,6 +696,7 @@  static int btree_submit_bio_hook(struct 
 				   __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 addr
 	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)
 {
--- linux-2.6.37-rc5/fs/btrfs/inode.c
+++ 2.6.37-rc5-btrfs-warnings/fs/btrfs/inode.c
@@ -5712,9 +5712,9 @@  static void btrfs_end_dio_bio(struct bio
 
 	if (err) {
 		printk(KERN_ERR "btrfs direct IO failed ino %lu rw %lu "
-		      "disk_bytenr %lu len %u err no %d\n",
-		      dip->inode->i_ino, bio->bi_rw, bio->bi_sector,
-		      bio->bi_size, err);
+		      "sector %#Lx len %u err no %d\n",
+		      dip->inode->i_ino, bio->bi_rw,
+		      (unsigned long long)bio->bi_sector, bio->bi_size, err);
 		dip->errors = 1;
 
 		/*