From patchwork Sun Mar 27 12:27:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 666541 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 p2RCNPWZ004427 for ; Sun, 27 Mar 2011 12:23:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753449Ab1C0MXW (ORCPT ); Sun, 27 Mar 2011 08:23:22 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:64352 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753443Ab1C0MXV (ORCPT ); Sun, 27 Mar 2011 08:23:21 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id BF585170119; Sun, 27 Mar 2011 20:23:14 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p2RCH4TV029136; Sun, 27 Mar 2011 20:17:04 +0800 Received: from [10.167.225.64] ([10.167.225.64]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011032720214629-118202 ; Sun, 27 Mar 2011 20:21:46 +0800 Message-ID: <4D8F2D32.3000601@cn.fujitsu.com> Date: Sun, 27 Mar 2011 20:27:30 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc14 Thunderbird/3.1.4 MIME-Version: 1.0 To: Chris Mason CC: Josef Bacik , Itaru Kitayama , Linux Btrfs Subject: [PATCH V2] btrfs: fix possible deadlock by clearing __GFP_FS flag References: <4D8EF048.5050203@cn.fujitsu.com> In-Reply-To: <4D8EF048.5050203@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-03-27 20:21:46, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-03-27 20:21:46, Serialize complete at 2011-03-27 20:21:46 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]); Sun, 27 Mar 2011 12:23:25 +0000 (UTC) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 3e1ea3e..cf55fa0 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1632,6 +1632,8 @@ struct btrfs_root *open_ctree(struct super_block *sb, goto fail_bdi; } + fs_info->btree_inode->i_mapping->flags &= ~__GFP_FS; + INIT_RADIX_TREE(&fs_info->fs_roots_radix, GFP_ATOMIC); INIT_LIST_HEAD(&fs_info->trans_list); INIT_LIST_HEAD(&fs_info->dead_roots); diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index a039065..57df380 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -88,6 +88,8 @@ struct inode *lookup_free_space_inode(struct btrfs_root *root, } spin_unlock(&block_group->lock); + inode->i_mapping->flags &= ~__GFP_FS; + return inode; }