From patchwork Wed Dec 1 01:33:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zefan X-Patchwork-Id: 369271 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 oB11WEse011067 for ; Wed, 1 Dec 2010 01:32:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753465Ab0LABbs (ORCPT ); Tue, 30 Nov 2010 20:31:48 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:56503 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753427Ab0LABbs convert rfc822-to-8bit (ORCPT ); Tue, 30 Nov 2010 20:31:48 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 1DEDA17049B; Wed, 1 Dec 2010 09:31:47 +0800 (CST) Received: from mailserver.fnst.cn.fujitus.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id oB11R8X5023133; Wed, 1 Dec 2010 09:27:09 +0800 Received: from lizf.localdomain ([10.167.225.51]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2010120109315649-131971 ; Wed, 1 Dec 2010 09:31:56 +0800 Message-ID: <4CF5A5E5.5040404@cn.fujitsu.com> Date: Wed, 01 Dec 2010 09:33:25 +0800 From: Li Zefan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b3pre) Gecko/20090513 Fedora/3.0-2.3.beta2.fc11 Thunderbird/3.0b2 MIME-Version: 1.0 To: Geert Uytterhoeven CC: Miao Xie , Chris Mason , linux-btrfs@vger.kernel.org, Linux Kernel Development , Andrew Morton Subject: Re: [PATCH] btrfs: Correct printing of sector_t References: In-Reply-To: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-01 09:31:56, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-01 09:31:58 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: 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]); Wed, 01 Dec 2010 01:32:14 +0000 (UTC) =================== [PATCH] btrfs: Fix compile warning when CONFIG_MIGRATION is not set Fix this newly introduced warning: fs/btrfs/disk-io.c:699: warning: 'btree_migratepage' defined but not used Signed-off-by: Li Zefan --- fs/btrfs/disk-io.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 33b6d45..7648247 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,10 @@ 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) {