From patchwork Sat Nov 27 22:53:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mitch Harder X-Patchwork-Id: 361682 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 oARMrWU7006967 for ; Sat, 27 Nov 2010 22:53:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753727Ab0K0WxY (ORCPT ); Sat, 27 Nov 2010 17:53:24 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:34999 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753710Ab0K0WxY convert rfc822-to-8bit (ORCPT ); Sat, 27 Nov 2010 17:53:24 -0500 Received: by qwb7 with SMTP id 7so3206100qwb.19 for ; Sat, 27 Nov 2010 14:53:23 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.86.13 with SMTP id q13mr3228850qcl.175.1290898403618; Sat, 27 Nov 2010 14:53:23 -0800 (PST) Received: by 10.220.76.71 with HTTP; Sat, 27 Nov 2010 14:53:23 -0800 (PST) Date: Sat, 27 Nov 2010 16:53:23 -0600 Message-ID: Subject: [next-rc] Compile Error fs/btrfs/diskio.c From: Mitch Harder To: linux-btrfs 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]); Sat, 27 Nov 2010 22:53:33 +0000 (UTC) --- fs/btrfs/disk-io.c 2010-11-27 15:59:22.896666675 -0600 +++ /usr/src/linux/fs/btrfs/disk-io.c 2010-11-27 16:08:15.643333349 -0600 @@ -696,6 +696,7 @@ __btree_submit_bio_done); } +#ifdef CONFIG_MIGRATION static int btree_migratepage(struct address_space *mapping, struct page *newpage, struct page *page) { @@ -715,6 +716,9 @@ return migrate_page(mapping, newpage, page); } +#else +#define btree_migratepage NULL +#endif static int btree_writepage(struct page *page, struct writeback_control *wbc) {