From 1ac6fdb136e12c577144f2de46cdcf04fff0f3bb Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 7 Dec 2010 14:54:09 +0000 Subject: [PATCH] --- yaml --- r: 223077 b: refs/heads/master c: 3dd1462e82bcab7625cec129952f26dae7a8b742 h: refs/heads/master i: 223075: 7a44929ebb518d2553b38d110d4e6bd80e82c5ab v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 6 ++---- trunk/fs/btrfs/inode.c | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0cf5b1acd02f..869882e22256 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdfb1e4f6c61477a61890b64974d65cdc3a98702 +refs/heads/master: 3dd1462e82bcab7625cec129952f26dae7a8b742 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index 33b6d459494c..b803c2667673 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/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) { diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 4875d69871b5..5f9194438f7c 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -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; /*