From patchwork Thu Dec 2 16:19:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sankar P X-Patchwork-Id: 375001 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 oB2GLppI014612 for ; Thu, 2 Dec 2010 16:21:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757861Ab0LBQVJ (ORCPT ); Thu, 2 Dec 2010 11:21:09 -0500 Received: from mail-gw0-f46.google.com ([74.125.83.46]:54339 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757663Ab0LBQVH (ORCPT ); Thu, 2 Dec 2010 11:21:07 -0500 Received: by gwj20 with SMTP id 20so4204784gwj.19 for ; Thu, 02 Dec 2010 08:21:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=PqKwhGHpU/YREB2rRygxCbzFkm3uVtkzOVAXAiLGgV0=; b=N9glO1wFoI60BrGDVVnOuQ1cGtJ404iussJd+lthmyCrgKTONPv5ZS/gL3ZexALyYX eZ8dex8zT2ZjZN4/dE7p5qjuXSsgQsVEQszCNwdAraveprXzPoGxkc/CUF1sU13Y7re0 ZqixZp2QQ90MtNpqX6maRKhNwpTdUVLatXDes= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=Sg4Bz06Sfs3i+MtWdMgNr+UmhOuPkYEA5oldtlax4qx/bmB8wq6q5M+kiXNblhZgDq CMF+3bvW/sBRZIsI/ho3I9p9Nr7aHSgHM84ZgINbUXWgaHW3Y1UxNxjtmoiVCHGiHRTp 1Hvzhd5SuPQ6XNQFRKyy5NdztXUeMCVB07gE4= Received: by 10.100.37.6 with SMTP id k6mr361379ank.217.1291306866172; Thu, 02 Dec 2010 08:21:06 -0800 (PST) Received: from localhost.localdomain ([122.179.50.38]) by mx.google.com with ESMTPS id c24sm690403ana.10.2010.12.02.08.20.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 02 Dec 2010 08:21:05 -0800 (PST) From: Sankar P To: Chris Mason , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sankar P Subject: [PATCH] fs: btrfs: Shuffle preprocessor macros Date: Thu, 2 Dec 2010 21:49:39 +0530 Message-Id: <1291306779-16186-1-git-send-email-sankar.curiosity@gmail.com> X-Mailer: git-send-email 1.7.1 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]); Thu, 02 Dec 2010 16:21:53 +0000 (UTC) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c547cca..7199239 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,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) {