From patchwork Mon Mar 15 15:00:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Piggin X-Patchwork-Id: 85983 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2FF0Sll020742 for ; Mon, 15 Mar 2010 15:00:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965133Ab0COPA0 (ORCPT ); Mon, 15 Mar 2010 11:00:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49584 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965065Ab0COPAZ (ORCPT ); Mon, 15 Mar 2010 11:00:25 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id BFA6C87D82; Mon, 15 Mar 2010 16:00:24 +0100 (CET) Received: by laptop.local0.net (Postfix, from userid 1000) id BA88A29879; Tue, 16 Mar 2010 02:00:16 +1100 (EST) Date: Tue, 16 Mar 2010 02:00:16 +1100 From: Nick Piggin To: linux-btrfs@vger.kernel.org, Chris Mason Subject: [patch] btrfs: fix gfp flags masking Message-ID: <20100315150016.GC2869@laptop> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) 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 (demeter.kernel.org [140.211.167.41]); Mon, 15 Mar 2010 15:00:28 +0000 (UTC) Index: linux-2.6/fs/btrfs/compression.c =================================================================== --- linux-2.6.orig/fs/btrfs/compression.c +++ linux-2.6/fs/btrfs/compression.c @@ -478,7 +478,7 @@ static noinline int add_ra_bio_pages(str goto next; } - page = alloc_page(mapping_gfp_mask(mapping) | GFP_NOFS); + page = alloc_page(mapping_gfp_mask(mapping) & ~__GFP_FS); if (!page) break;