From patchwork Tue Dec  7 14:54:09 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Beulich <jbeulich@novell.com>
X-Patchwork-Id: 383222
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB7EsIg9012410
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Tue, 7 Dec 2010 14:54:18 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754396Ab0LGOyN (ORCPT
	<rfc822;patchwork-linux-btrfs@patchwork.kernel.org>);
	Tue, 7 Dec 2010 09:54:13 -0500
Received: from vpn.id2.novell.com ([195.33.99.129]:58134 "EHLO
	vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753032Ab0LGOyM convert rfc822-to-8bit (ORCPT
	<rfc822;groupwise-JBeulich@novell.com:2:1>);
	Tue, 7 Dec 2010 09:54:12 -0500
Received: from EMEA1-MTA by vpn.id2.novell.com
	with Novell_GroupWise; Tue, 07 Dec 2010 15:27:12 +0000
Message-Id: <4CFE58A102000078000266EC@vpn.id2.novell.com>
X-Mailer: Novell GroupWise Internet Agent 8.0.1 
Date: Tue, 07 Dec 2010 14:54:09 +0000
From: "Jan Beulich" <JBeulich@novell.com>
To: "Chris Mason" <chris.mason@oracle.com>
Cc: <linux-btrfs@vger.kernel.org>
Subject: [PATCH] btrfs: avoid compiler warnings
Mime-Version: 1.0
Content-Disposition: inline
Sender: linux-btrfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-btrfs.vger.kernel.org>
X-Mailing-List: linux-btrfs@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 07 Dec 2010 14:54:18 +0000 (UTC)


--- 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;
 
 		/*