Commit 3dd1462e authored by Jan Beulich's avatar Jan Beulich Committed by Chris Mason
Browse files

Btrfs: fix compiler warnings

... regarding an unused function when !MIGRATION, and regarding a
printk() format string vs argument mismatch.
Signed-off-by: default avatarJan Beulich <>
Signed-off-by: default avatarChris Mason <>
parent fdfb1e4f
......@@ -696,6 +696,7 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,
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;
return migrate_page(mapping, newpage, page);
return -ENOSYS;
static int btree_writepage(struct page *page, struct writeback_control *wbc)
......@@ -5712,9 +5712,9 @@ static void btrfs_end_dio_bio(struct bio *bio, int err)
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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment