From patchwork Tue Mar 29 05:48:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Itaru Kitayama X-Patchwork-Id: 670672 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 p2T5mETF032655 for ; Tue, 29 Mar 2011 05:48:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752694Ab1C2FsL (ORCPT ); Tue, 29 Mar 2011 01:48:11 -0400 Received: from irs1ma.bb4u.ne.jp ([202.229.9.180]:35262 "EHLO irs1ma.bb4u.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752347Ab1C2FsJ (ORCPT ); Tue, 29 Mar 2011 01:48:09 -0400 Received: from prime (nc220194.bb4u.ne.jp [58.89.220.194]) by irs1ma.bb4u.ne.jp (Postfix) with SMTP id 1586C4E0449; Tue, 29 Mar 2011 14:48:05 +0900 (JST) Date: Tue, 29 Mar 2011 14:48:05 +0900 From: Itaru Kitayama To: miaox@cn.fujitsu.com Cc: Chris Mason , Linux Btrfs Subject: Re: [PATCH V2] btrfs: fix possible deadlock by clearing __GFP_FS flag Message-Id: <20110329144805.507dfe30.kitayama@cl.bb4u.ne.jp> In-Reply-To: <4D8F2D32.3000601@cn.fujitsu.com> References: <4D8EF048.5050203@cn.fujitsu.com> <4D8F2D32.3000601@cn.fujitsu.com> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; x86_64-redhat-linux-gnu) Mime-Version: 1.0 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 29 Mar 2011 05:48:15 +0000 (UTC) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 8862dda..03e5ab3 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2641,7 +2641,7 @@ int extent_readpages(struct extent_io_tree *tree, prefetchw(&page->flags); list_del(&page->lru); if (!add_to_page_cache_lru(page, mapping, - page->index, GFP_KERNEL)) { + page->index, GFP_NOFS)) { __extent_read_full_page(tree, page, get_extent, &bio, 0, &bio_flags); }