From patchwork Thu May 20 07:24:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 101148 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 o4K7QJkt005578 for ; Thu, 20 May 2010 07:26:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753914Ab0ETH0Q (ORCPT ); Thu, 20 May 2010 03:26:16 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:52611 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754090Ab0ETH0G (ORCPT ); Thu, 20 May 2010 03:26:06 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id AE73C17016A; Thu, 20 May 2010 15:26:03 +0800 (CST) Received: from 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 o4K7O18x016227; Thu, 20 May 2010 15:24:01 +0800 Received: from [127.0.0.1] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 0A5BD10C0A2; Thu, 20 May 2010 15:29:39 +0800 (CST) Message-ID: <4BF4E3BA.8030607@cn.fujitsu.com> Date: Thu, 20 May 2010 15:24:42 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Chris Mason , Linux Btrfs Subject: [PATCH 09/10] btrfs: fix some problem in btrfs_link() 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]); Thu, 20 May 2010 07:26:19 +0000 (UTC) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1cef510..1392a09 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4418,15 +4418,18 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, if (err) return err; - btrfs_inc_nlink(inode); + trans = btrfs_start_transaction(root, 1); + if (!trans) { + err = -ENOMEM; + goto fail; + } err = btrfs_set_inode_index(dir, &index); if (err) goto fail; - trans = btrfs_start_transaction(root, 1); - btrfs_set_trans_block_group(trans, dir); + btrfs_inc_nlink(inode); atomic_inc(&inode->i_count); err = btrfs_add_nondir(trans, dentry, inode, 1, index);